Minor import cleanup.
Merge pull request #186 from sarality/minor_import_cleanup

Minor import cleanup.