Some cleanups to imports
2 files changed