minor cleanups: imports