KCINFR-979: removing imports