Remove unnecessary layer of EventProviderCollectors