Remove unused imports.
Merge pull request #735 from kuyan/patch-2

Remove some unused imports