Clean up models
Clean up controllers