KRACOEUS-7343: cleanup sloppy code