removed obsolete classes, pieces of code