CorrelationId cleanup