add getter for activityId
remove activityId variable