cleanup: more unused imports