Remove unused variables
Remove unnecessary comment
Merge pull request #2798 from tricknotes/remove-unused

Remove unused