removed a bit of legacy code