[3547382] Removed thedeprecated layouts from code.