cleanup for #22125