issue #20168: cleanup