Remove unused variables. Fix warnings
Merge pull request #1150 from igorko/master

Remove unused variables. Fix warnings