Removed some unecessary files
Last files to remove are removed (I think).
Removed duplicate code