removed legacy code