Cleanup some unnecessary stuff in the master branch