Some import cleanup

Removed unneeded imports, new import style: stdlib, empty line, external
modules, empty line, internal modules.