Removed a lot of junk from my first pull request