cleanup
removed obsolete classes