Sumada Kaabaha: order cleanup