Deleted unecessary code

4 files and several thousand lines