Unbreak the Clang -Werror build by removing some unused variables