CHO: cleanup [Fixes #82337558]