views cleaned up