removed obsolete class
bugfixes