Clean up unused variables
Merge pull request #1346 from tricknotes/remove-unused

Clean up unused variables