More FEAT_* removal