MODE-2294: Remove unused imports