Got rid of the feature tags