removing funcs/defs that i no longer need