Cleaning up controllers