Refactor controllers.
Cleanup, remove obsolete code.