We don't need those funcs any longer. Heck, we never really even used them