remove deprecated funcs