issue #20864: cleanup