Cleaned up some controllers.