removed obsolete classes