remove needless funcs