Cleaned up further unused imports.
Merge pull request #947 from BenMorel/unused-imports

Cleaned up further unused imports.