removed obsolete code and tests