get rid of legacy functions