Remove overly-specific funcs