cleaning up the master branch