Removing unused variables
Merge pull request #487 from gvn/morecompliant

Removing unused variables