Remove some unused variables to clean the Clang -Werror build

(these were added in r177089)