issue #19456: cleanup