Refactor.

Removed a couple unused imports.