issue #22669: Take advantage of extended cleanup performed by delete function.