Started cleaning up
Removed obsolete files for now