Fixup for 0051653 : simplified bucket destroying iteration