Cleaned up unused imports
Merge pull request #946 from BenMorel/unused-imports

Cleaned up unused imports