Cleaning up some imports

Trivial cleanup of some import statements.