KCINFR-979: removing unused code