Cleaning up controllers, cleaning up logging.