Removed some unnecessary files created by the merge