Drop some unused vars
Merge pull request #1109 from vipulnsward/lose-vars

Drop some unused vars