removed code and tests for obsolete code