remove some legacy functions that are now in upstream