Remove unused variables
Merge pull request #21 from mscdex/master

Remove unused variables
Merge