Delete redundant feature flag code