Cleaning up the master branch