CR feedback and removing CompositeValueProviders