forgot to rm some fns