removed obsolete legacy code