removing unused funcs