make cleanup indempotent