-removed legacy code