KCINFR-979: cleaning up code

a little more cleanup