Remove references to old functions