Removed a bunch of files, reverted a few changes