issue #20771: cleanup