Removed all stuff related to the merge to master prep.