removed obsolete classes, fixed constructors