Code quality
Feature Flag Cleanup: Delete Old Branches After Launch
Feature flag cleanup starts after the launch decision, when the codebase still contains both paths, metrics dashboards still segment by variant, and on-call still treats the flag as a rollback lever. The stale flag is not just an if statement; it is a product decision that needs to be made permanent.
The useful output is a flag retirement pull request with decision evidence, code removal, provider cleanup, dashboard updates, and rollback notes. Keep the review concrete: Make the product decision explicit before removing the losing branch, then make the next action visible to the team that owns the risk. That matters because the cleanup can still go wrong when removing a flag still used for emergency rollback.
Key takeaways
- Treat each cleanup candidate as an owned system with dependencies, not anonymous clutter.
- Use one full release cycle after the feature is fully rolled out, including any rollback freeze before deciding that “quiet” means “unused.”
- Prefer reversible changes first when removing a flag still used for emergency rollback is still plausible.
- Leave behind a flag retirement pull request with decision evidence, code removal, provider cleanup, dashboard updates, and rollback notes so the next review starts with context.
- Measure the result as lower spend, lower risk, less operational drag, or clearer ownership.
Map the Flag Decision
Start with one shipped flag family across application code, flag provider rules, dashboards, experiments, release notes, and rollback docs. The best cleanup scope is small enough that owners can answer quickly but wide enough to include the attachments that make removal risky.
| Field | Why it matters |
|---|---|
| Owner | Cleanup needs a person or team that can accept the decision |
| Current purpose | A short reason to keep the item, written in present tense |
| Last meaningful use | owners, callers, last change, runtime behavior, and deletion confidence |
| Dependency evidence | repository search, tests, logs, deploy history, and owner review |
| Risk if wrong | The outage, data loss, access failure, or rollback gap the review must avoid |
| Next action | Keep, reduce, archive, disable, remove, or investigate |
Do not make the inventory larger than the decision. A short list with owners and evidence beats a perfect spreadsheet that nobody is willing to act on.
Prove the Old Branch Is Done
The useful question is not “how old is it?” It is “what would break, become harder to recover, or lose accountability if this disappeared?” For feature flag cleanup, collect enough evidence to answer that without relying on naming conventions.
| Check | What to look for | Cleanup signal |
|---|---|---|
| Decision state | Launch notes, experiment results, rollout percentage, and owner sign-off | The team has chosen the winning behavior and no longer needs runtime choice |
| Code references | Flag reads, default values, tests for both branches, dead variants, and generated clients | Only the permanent branch should remain after the cleanup |
| Operational use | Recent toggles, incident rollback notes, support playbooks, and release freezes | The flag has not been used as a safety control during the review window |
| Analytics and docs | Dashboards, event properties, screenshots, and customer-facing docs | Reporting and docs can move to the permanent behavior |
Use several signals together. Activity can miss monthly jobs and incident-only paths. Ownership can be stale. Cost can distract from security or recovery risk. The strongest case combines runtime data, dependency checks, owner review, and a rollback plan.
If the evidence conflicts, label the item “investigate” with a named owner and review date. That is still progress because the next review starts with a narrower question.
Example Evidence Check
Search for the flag across code, tests, dashboards, and docs before deleting either branch.
rg "new_checkout|NEW_CHECKOUT|checkout_variant" src tests config docs
rg "flag\(|variation\(|isEnabled\(" src tests
rg "rollback|kill switch|experiment" docs runbooks
Treat the output as a candidate list. Do not pipe these checks into delete commands; add owner review, dependency checks, and a rollback path first.
Retire the Flag in One Change
Use the least permanent move that proves the decision. In feature flag cleanup, removal is only one possible outcome; reducing size, narrowing permission, shortening retention, archiving, or disabling a trigger may produce the same benefit with less risk.
- Make the product decision explicit before removing the losing branch.
- Delete flag reads and tests in the same pull request as provider configuration cleanup.
- Keep a rollback commit or release note instead of preserving a permanent runtime switch.
Track the cleanup candidate with a simple priority score:
| Score | Good sign | Bad sign |
|---|---|---|
| Impact | Meaningful spend, risk, toil, noise, or confusion disappears | The item is cheap and low-risk but politically distracting |
| Confidence | Owner, purpose, and dependency path are understood | The team is guessing from age or name |
| Reversibility | Restore, recreate, re-enable, or rollback path exists | Deletion would be the first real test |
| Prevention | A rule can stop recurrence | The same pattern will return next month |
Start with high-impact, high-confidence, reversible candidates. Defer confusing items only if they get an owner and a date; otherwise “defer” becomes another word for keeping waste permanently.
Flags That Need a Slower Exit
Some cleanup candidates are supposed to look quiet. Do not rush these cases:
- Flags used as emergency kill switches, regional controls, or customer-specific entitlements.
- Mobile or desktop clients that keep old flag behavior after the web release is cleaned up.
- Experiments whose metrics still feed quarterly reporting or pricing decisions.
For these cases, use a longer observation window, explicit owner approval, and a staged reduction. The point is not to avoid cleanup; it is to avoid making the first proof of dependency an outage.
Run the Launch Cleanup
Run feature flag cleanup as a decision review, not an open-ended hygiene project.
- Pick the narrow scope and export the candidate list.
- Add owner, current purpose, last-use evidence, dependency checks, and risk if wrong.
- Remove obvious false positives, then ask owners to choose keep, reduce, archive, disable, remove, or investigate.
- Apply the least permanent useful change first.
- Watch the signals that would reveal a bad decision.
- Complete the final removal only after the review window closes.
- Save a flag retirement pull request with decision evidence, code removal, provider cleanup, dashboard updates, and rollback notes.
For broader cleanup planning, use the cleanup library to pair this guide with related notes. If the cleanup has infrastructure impact, pair it with a visible owner, a rollback path, and a measurable business case. For infrastructure cleanup, the main cloud cost optimization checklist is a useful companion.
Make Flags Expire by Design
Prevention should change the creation path, not just the cleanup path. For feature flag cleanup, the useful prevention fields are owner, reason to exist, removal trigger, and verification notes. Make those fields part of normal creation and review.
- Require each new flag to include an owner, expected removal date, and cleanup ticket.
- Block launch completion until the team records whether the flag becomes permanent or is deleted.
- Report flags that are fully rolled out but still read in production code.
The recurring review should be short: sort by impact, pick the unclear items, assign owners, and close the loop on anything nobody claims. If the review keeps producing the same class of candidate, fix the creation path instead of celebrating repeated cleanup.
Example Decision Record
Use a compact record so the cleanup can be reviewed later without reconstructing the whole investigation.
| Field | Example entry for this cleanup |
|---|---|
| Candidate | Stale feature flags in application codebases |
| Why it looked stale | Low recent activity, unclear owner, or no current consumer after the first review |
| Evidence checked | Decision state, Code references, and owner confirmation |
| First reversible move | Make the product decision explicit before removing the losing branch |
| Watch signal | The metric, alert, job, route, query, or owner complaint that would show the cleanup was wrong |
| Final action | Keep, reduce, archive, disable, or remove after one full release cycle after the feature is fully rolled out, including any rollback freeze |
| Prevention rule | Require each new flag to include an owner, expected removal date, and cleanup ticket |
This record is intentionally small. If the decision needs a long narrative, the candidate is probably not ready for removal yet. Keep investigating until the owner, evidence, reversible move, and prevention rule are clear.
FAQ
How often should teams do feature flag cleanup?
Use one full release cycle after the feature is fully rolled out, including any rollback freeze for the first decision, then set a recurring cadence based on change rate. Fast-moving non-production systems may need monthly review; slower systems can be quarterly if every unclear item has an owner and a review date.
What is the safest first action?
The safest first action is usually ownership repair plus evidence collection. After that, make the product decision explicit before removing the losing branch. That creates a visible test before permanent deletion.
What should not be removed quickly?
Do not rush anything connected to flags used as emergency kill switches, regional controls, or customer-specific entitlements. Also slow down when the cleanup affects recovery, compliance, customer-specific behavior, rare schedules, or security response.
How do you make the decision useful later?
Write the decision as a small operational record: candidate, owner, evidence, chosen action, watch signals, rollback path, final date, and prevention rule. That format helps future engineers, search engines, and AI assistants understand the cleanup without guessing.