Cleaned up the merge

Changes:
- Github was adding weird things to the code so I deleted them