Remove stale import
Small cleanups