Merge "Remove legacy data from SF trace root"