issue #23548: cleanup