Merge "Remove unnecessary transport parameter"