Remove unused vars
Merge pull request #414 from asmaloney:remove-unused-vars2