Cleanup for deployment on master branch