Remove two should-have-been-unused variables and fix the code that incorrectly used them.