Removed unused variables
Merge pull request #1553 from saro0h/remove-unused-variables

Removed unused variables.