Deploying to production and controller clean up