removing dependence on old scheme