remove references to deprecated and legacy functions