Clean up, make idempotent