Remove unused layout code