Sumada Kaabaha: safe cleanup