AI-482 - optimized imports (cleanup)