Remove unused variables
Merge pull request #2269 from tricknotes/remove-unused-variables

Remove unused variables