Remove unused vars
Merge pull request #790 from vipulnsward/clean_unused_vars

Remove unused vars