KRACOEUS-7838 clean up