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