[TASK] Remove unused variables
Merge pull request #329 from fudriot/develop-remove-unused-variable

[TASK] Remove unused variables