KCINFR-979: cleaning up code while doing analysis