Cleanup models
Cleanup controllers
Cleanup views