Some cleanups to imports