Removed various unused vars
Merge pull request #561 from tgriesser/unused-vars

Remove unused variables