issue #23086: cleanup