remove deprecated functions, per zach review