Comment
Removed ClauseProviderResolver (as announced)