Cleaning out some unnecessary files

Fixing up some things after that lame branch merge a few days ago