removal of legacy code