Cleanup some unused variables.
Merge pull request #294 from vipulnsward/cleanup

Cleanup some unused variables.