issue #19290: cleanup