minor refactor: remove some unused imports and expand some * imports (expansion was just where optimize imports made such a change for files having unused imports)