Removal of Unused Files

And also the beginning of the removal of unused code