Remove unused var declarations
Merge pull request #1789 from STAH/unused-vars

Remove unused var declarations