activity feed complete cleanup before merge