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

Remove unused variables