Dropping unused variables
Merge pull request #1330 from mdxs/develop

Dropping unused variables