KRACOEUS-6913: removing commented out code