lots of import cleanups