issue #21448: cleanup