Cleaning up MainController