r25034: Remove unused variables.