Remove unused
Clean up duplicate layouts