removed obsoleted classes