issue #21986: cleanup