minor import cleanups
more internal cleanup