Ensure clean is now idempotent