Fix typo and remove unused variables
Merge pull request #2279 from JasonKriss/unused-vars

Fix typo and remove unused variables