Removing the old files in preparation for the merge