issue #19453: cleanup