Remove classes derived from Value and include IndicatorGroup