cleaning code, removing unused variables
Merge pull request #1967 from victorgp/cleaning-code-minor-change

Cleaning code, removing unused variables