PLAT-6711 Removed unused imports