remove untested legacy code