Clean up of old layout code