Make deletion optional