Remove DiscreteTypeSet