Remove unused functions introduced in r172685 to unbreak the Clang -Werror build