Cleanup a couple unused variables
Merge pull request #2437 from zpao/lint-cleanup

Cleanup a couple unused variables