Removed some unused var statements
Merge pull request #898 from DickvdBrink/unused-vars2

Removed some unused var statements