Various import cleanups