Add conditional destroy