unused var cleanup
Merge pull request #165 from mdp/unused_var

Remove unused variables