Removed unused classes

Old unused classes were removed