EZP-21191: removed unused imports