issue #19840: cleanup