issue #21038: cleanup