Remove unused variables.
Merge pull request #487 from XhmikosR/unused

Remove unused variables.