remove unneeded fns