various changes
Removed obsolete classes