Removed unused import and variables.
Merge pull request #1751 from akarnokd/Remove_unused

Removed unused imports and variables.