legacy code removed