Remove some unused variables
Merge pull request #687 from DickvdBrink/unused-vars

Remove some unused variables