[Refactoring] Unused imports were removed