Removed some unused variables
Merge pull request #239 from mpeterv/remove_unused_variables

Removed some unused variables