teiiddes-1642: Removed unused imports