Clean up other layouts