It is unclear if this is worth the effort to manage (so this may be reverted later) but at least it seems we could remove a bunch of lines from the lockfile by removing unused feature flags.