Remove unused variables and fix typos
Merge pull request #2379 from vipulnsward/remove_unused_vars

Remove unused variables and fix typos