cleanup activityGroup creation a bit