cleanups of unused imports and reorderings