Cleans up some controllers.