Cleanup the controller a bit