Removing unused variables.
Merge pull request #360 from cduclos/master

Remove unused variables