Some import cleanups