remove outdated funcs