Cleanup
Merge pull request #7091 from chinhodado/patch-6

Cleanup an unused variable