remove activity wrappers, use ActivityCorrelator instead