Cleanup imports
Merge pull request #292 from waigani/imports-cleanup

Cleanup imports

Simple PR to cleanup imports.