Remove old_features options since we should always be using the old (cheap) registration cost for features.
Fix merging conflicts for removing old features option