A little code cleanup.
Clean up imports.