diff --git a/src/AutoRest.CSharp/Common/Generation/Writers/PageableMethodsWriterExtensions.cs b/src/AutoRest.CSharp/Common/Generation/Writers/PageableMethodsWriterExtensions.cs
index 44acb172e12..bbf1bd5597c 100644
--- a/src/AutoRest.CSharp/Common/Generation/Writers/PageableMethodsWriterExtensions.cs
+++ b/src/AutoRest.CSharp/Common/Generation/Writers/PageableMethodsWriterExtensions.cs
@@ -219,7 +219,7 @@ private static bool ContainsRequestContext(IReadOnlyCollection<Parameter>? param
                     continue;
                 }
 
-                var convenienceParameter = ProtocolToConvenienceParameterConverters.FirstOrDefault(convert => convert.Convenience.Name == parameter.Name)?.Convenience;
+                var convenienceParameter = ProtocolToConvenienceParameterConverters.FirstOrDefault(convert => convert.Convenience?.Name == parameter.Name)?.Convenience;
                 if (convenienceParameter == null)
                 {
                     throw new InvalidOperationException($"Cannot find corresponding convenience parameter for create request method parameter {parameter.Name}.");
diff --git a/src/AutoRest.CSharp/Common/Output/Expressions/Snippets.cs b/src/AutoRest.CSharp/Common/Output/Expressions/Snippets.cs
index 3f89b2b6589..19b6cdef4d9 100644
--- a/src/AutoRest.CSharp/Common/Output/Expressions/Snippets.cs
+++ b/src/AutoRest.CSharp/Common/Output/Expressions/Snippets.cs
@@ -25,6 +25,8 @@ internal static partial class Snippets
         public static ValueExpression Dash { get; } = new KeywordExpression("_", null);
         public static ValueExpression Default { get; } = new KeywordExpression("default", null);
         public static ValueExpression Null { get; } = new KeywordExpression("null", null);
+
+        public static ValueExpression DefaultOf(CSharpType type) => type is { IsValueType: true, IsNullable: false } ? Default.CastTo(type) : Null.CastTo(type);
         public static ValueExpression This { get; } = new KeywordExpression("this", null);
         public static BoolExpression True { get; } = new(new KeywordExpression("true", null));
         public static BoolExpression False { get; } = new(new KeywordExpression("false", null));
@@ -35,7 +37,7 @@ internal static partial class Snippets
         public static ValueExpression Float(float value) => new FormattableStringToExpression($"{value}f");
         public static ValueExpression Double(double value) => new FormattableStringToExpression($"{value}d");
 
-        public static ValueExpression Nameof(ValueExpression expression) => new InvokeInstanceMethodExpression(null, "nameof", new[]{expression}, null, false);
+        public static ValueExpression Nameof(ValueExpression expression) => new InvokeInstanceMethodExpression(null, "nameof", new[] { expression }, null, false);
         public static ValueExpression ThrowExpression(ValueExpression expression) => new KeywordExpression("throw", expression);
 
         public static ValueExpression NullCoalescing(ValueExpression left, ValueExpression right) => new BinaryOperatorExpression("??", left, right);
@@ -46,8 +48,8 @@ public static ValueExpression RemoveAllNullConditional(ValueExpression expressio
             => expression switch
             {
                 NullConditionalExpression nullConditional => RemoveAllNullConditional(nullConditional.Inner),
-                MemberExpression { Inner: {} inner } member => member with {Inner = RemoveAllNullConditional(inner)},
-                TypedValueExpression typed => typed with { Untyped = RemoveAllNullConditional(typed.Untyped)},
+                MemberExpression { Inner: { } inner } member => member with { Inner = RemoveAllNullConditional(inner) },
+                TypedValueExpression typed => typed with { Untyped = RemoveAllNullConditional(typed.Untyped) },
                 _ => expression
             };
 
@@ -86,9 +88,9 @@ public static EnumerableExpression InvokeArrayEmpty(CSharpType arrayItemType)
             => new(arrayItemType, new InvokeStaticMethodExpression(typeof(Array), nameof(Array.Empty), Array.Empty<ValueExpression>(), new[] { arrayItemType }));
 
         public static StreamExpression InvokeFileOpenRead(string filePath)
-            => new(new InvokeStaticMethodExpression(typeof(System.IO.File), nameof(System.IO.File.OpenRead), new[]{Literal(filePath)}));
+            => new(new InvokeStaticMethodExpression(typeof(System.IO.File), nameof(System.IO.File.OpenRead), new[] { Literal(filePath) }));
         public static StreamExpression InvokeFileOpenWrite(string filePath)
-            => new(new InvokeStaticMethodExpression(typeof(System.IO.File), nameof(System.IO.File.OpenWrite), new[]{Literal(filePath)}));
+            => new(new InvokeStaticMethodExpression(typeof(System.IO.File), nameof(System.IO.File.OpenWrite), new[] { Literal(filePath) }));
 
         // Expected signature: MethodName(Utf8JsonWriter writer);
         public static MethodBodyStatement InvokeCustomSerializationMethod(string methodName, Utf8JsonWriterExpression utf8JsonWriter)
@@ -100,7 +102,7 @@ public static MethodBodyStatement InvokeCustomBicepSerializationMethod(string me
 
         // Expected signature: MethodName(JsonProperty property, ref T optional)
         public static MethodBodyStatement InvokeCustomDeserializationMethod(string methodName, JsonPropertyExpression jsonProperty, CodeWriterDeclaration variable)
-            => new InvokeStaticMethodStatement(null, methodName, new ValueExpression[]{jsonProperty, new FormattableStringToExpression($"ref {variable}")});
+            => new InvokeStaticMethodStatement(null, methodName, new ValueExpression[] { jsonProperty, new FormattableStringToExpression($"ref {variable}") });
 
         public static AssignValueIfNullStatement AssignIfNull(ValueExpression variable, ValueExpression expression) => new(variable, expression);
         public static AssignValueStatement Assign(ValueExpression variable, ValueExpression expression) => new(variable, expression);
diff --git a/src/AutoRest.CSharp/LowLevel/Generation/DpgClientWriter.cs b/src/AutoRest.CSharp/LowLevel/Generation/DpgClientWriter.cs
index e465466c6a9..495ec6dfdcb 100644
--- a/src/AutoRest.CSharp/LowLevel/Generation/DpgClientWriter.cs
+++ b/src/AutoRest.CSharp/LowLevel/Generation/DpgClientWriter.cs
@@ -94,7 +94,8 @@ public void WriteClient()
                         WriteRequestCreationMethod(_writer, method, _client.Fields);
                     }
 
-                    if (_client.ClientMethods.Any(cm => cm.ConvenienceMethod is not null))
+                    // since the non-azure libraries do not have cancellationToken parameters on their convenience methods, we do not need to add the method to convert the cancellationToken to RequestContext
+                    if (Configuration.IsBranded && _client.ClientMethods.Any(cm => cm.ConvenienceMethod is not null))
                     {
                         WriteCancellationTokenToRequestContextMethod();
                     }
diff --git a/src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethod.cs b/src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethod.cs
index b9d3f397bce..f5cf85ed4cd 100644
--- a/src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethod.cs
+++ b/src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethod.cs
@@ -24,7 +24,7 @@ namespace AutoRest.CSharp.Output.Models
 {
     internal record ConvenienceMethod(MethodSignature Signature, IReadOnlyList<ProtocolToConvenienceParameterConverter> ProtocolToConvenienceParameterConverters, CSharpType? ResponseType, IReadOnlyList<string>? RequestMediaTypes, IReadOnlyList<string>? ResponseMediaTypes, Diagnostic? Diagnostic, bool IsPageable, bool IsLongRunning, string? Deprecated)
     {
-        private record ConvenienceParameterInfo(Parameter Convenience, ConvenienceParameterSpread? ConvenienceSpread);
+        private record ConvenienceParameterInfo(Parameter? Convenience, ConvenienceParameterSpread? ConvenienceSpread);
 
         public IEnumerable<MethodBodyStatement> GetConvertStatements(LowLevelClientMethod clientMethod, bool async, FieldDeclaration clientDiagnostics)
         {
@@ -33,7 +33,7 @@ public IEnumerable<MethodBodyStatement> GetConvertStatements(LowLevelClientMetho
             var protocolInvocationExpressions = new List<ValueExpression>();
             foreach (var protocol in protocolMethod.Parameters)
             {
-                var (convenience, convenienceSpread) = parametersDict[protocol.Name]; // TODO -- maybe change it to name as keys?
+                var (convenience, convenienceSpread) = parametersDict[protocol.Name];
                 if (protocol == KnownParameters.RequestContext || protocol == KnownParameters.RequestContextRequired)
                 {
                     // convert cancellationToken to request context
@@ -46,18 +46,15 @@ public IEnumerable<MethodBodyStatement> GetConvertStatements(LowLevelClientMetho
                         yield return Declare(context, new InvokeStaticMethodExpression(null, "FromCancellationToken", new ValueExpression[] { convenience }));
                         protocolInvocationExpressions.Add(context);
                     }
-                    else if (!protocol.IsOptionalInSignature)
-                    {
-                        // when we do not have a cancellationToken, and the requestContext parameter is required in protocol signature, we pass a null
-                        protocolInvocationExpressions.Add(Null.CastTo(protocol.Type));
-                    }
                     else
                     {
-                        // do nothing
+                        // if convenience parameter is null here, we just use the default value of the protocol parameter as value (we always do this even if the parameter is optional just in case there is an ordering issue)
+                        protocolInvocationExpressions.Add(DefaultOf(protocol.Type));
                     }
                 }
                 else if (protocol == KnownParameters.RequestContent || protocol == KnownParameters.RequestContentNullable)
                 {
+                    Debug.Assert(convenience is not null);
                     // convert body to request content
                     if (convenienceSpread == null)
                     {
@@ -75,10 +72,17 @@ public IEnumerable<MethodBodyStatement> GetConvertStatements(LowLevelClientMetho
                 else
                 {
                     // process any other parameter
-                    // in this case, convenience parameter should never be null
-                    Debug.Assert(convenience is not null);
-                    var expression = convenience.GetConversionToProtocol(protocol.Type, RequestMediaTypes?.FirstOrDefault());
-                    protocolInvocationExpressions.Add(expression);
+                    if (convenience != null)
+                    {
+                        // if convenience parameter is not null here, we convert it to protocol parameter value properly
+                        var expression = convenience.GetConversionToProtocol(protocol.Type, RequestMediaTypes?.FirstOrDefault());
+                        protocolInvocationExpressions.Add(expression);
+                    }
+                    else
+                    {
+                        // if convenience parameter is null here, we just use the default value of the protocol parameter as value (we always do this even if the parameter is optional just in case there is an ordering issue)
+                        protocolInvocationExpressions.Add(DefaultOf(protocol.Type));
+                    }
                 }
             }
 
@@ -210,7 +214,7 @@ private MethodBodyStatement GetSpreadConversion(ConvenienceParameterSpread conve
         }
     }
 
-    internal record ProtocolToConvenienceParameterConverter(Parameter Protocol, Parameter Convenience, ConvenienceParameterSpread? ConvenienceSpread);
+    internal record ProtocolToConvenienceParameterConverter(Parameter Protocol, Parameter? Convenience, ConvenienceParameterSpread? ConvenienceSpread);
 
     internal record ConvenienceParameterSpread(ModelTypeProvider BackingModel, IReadOnlyList<Parameter> SpreadedParameters);
 }
diff --git a/src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethodOmittingMessage.cs b/src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethodOmittingMessage.cs
index b6cc9026b7d..e3ac298d8be 100644
--- a/src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethodOmittingMessage.cs
+++ b/src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethodOmittingMessage.cs
@@ -12,10 +12,6 @@ private ConvenienceMethodOmittingMessage(string message)
 
         public string Message { get; }
 
-        public static ConvenienceMethodOmittingMessage AnonymousModel = new("The convenience method of this operation is omitted because it is using at least one anonymous model");
-
-        public static ConvenienceMethodOmittingMessage NotConfident = new("The convenience method of this operation is made internal because this operation directly or indirectly uses a low confident type, for instance, unions, literal types with number values, etc.");
-
         public static ConvenienceMethodOmittingMessage NotMeaningful = new("The convenience method is omitted here because it has exactly the same parameter list as the corresponding protocol method");
     }
 }
diff --git a/src/AutoRest.CSharp/LowLevel/Output/OperationMethodChainBuilder.cs b/src/AutoRest.CSharp/LowLevel/Output/OperationMethodChainBuilder.cs
index 40dd44a409c..681cb8b659b 100644
--- a/src/AutoRest.CSharp/LowLevel/Output/OperationMethodChainBuilder.cs
+++ b/src/AutoRest.CSharp/LowLevel/Output/OperationMethodChainBuilder.cs
@@ -96,12 +96,15 @@ public LowLevelClientMethod BuildOperationMethodChain()
                 ? new[] { new CSharpAttribute(typeof(ObsoleteAttribute), Literal(deprecated)) }
                 : Array.Empty<CSharpAttribute>();
 
-            var shouldRequestContextOptional = ShouldRequestContextOptional();
-            var protocolMethodParameters = _orderedParameters.Select(p => p.Protocol).WhereNotNull().Select(p => p != KnownParameters.RequestContentNullable && !shouldRequestContextOptional ? p.ToRequired() : p).ToArray();
+            var isRequestContextOptional = _orderedParameters.Any(p => p.Protocol == KnownParameters.RequestContext);
+            // because request context is always the last parameter, when request context is changed to required by some reason, all parameters before it (which means all parameters) should be required
+            var protocolMethodParameters = isRequestContextOptional
+                ? _orderedParameters.Select(p => p.Protocol).WhereNotNull().ToArray()
+                : _orderedParameters.Select(p => p.Protocol?.ToRequired()).WhereNotNull().ToArray();
             var protocolMethodModifiers = (Operation.GenerateProtocolMethod ? _restClientMethod.Accessibility : Internal) | Virtual;
             var protocolMethodSignature = new MethodSignature(_restClientMethod.Name, FormattableStringHelpers.FromString(_restClientMethod.Summary), FormattableStringHelpers.FromString(_restClientMethod.Description), protocolMethodModifiers, _returnType.Protocol, null, protocolMethodParameters, protocolMethodAttributes);
             var convenienceMethodInfo = ShouldGenerateConvenienceMethod();
-            var convenienceMethod = BuildConvenienceMethod(shouldRequestContextOptional, convenienceMethodInfo);
+            var convenienceMethod = BuildConvenienceMethod(isRequestContextOptional, convenienceMethodInfo);
 
             var diagnostic = new Diagnostic($"{_clientName}.{_restClientMethod.Name}");
 
@@ -202,7 +205,7 @@ private ConvenienceMethodGenerationInfo ShouldGenerateConvenienceMethod()
         // If all the corresponding parameters and return types of convenience method and protocol method have the same type, it does not make sense to generate the convenience method.
         private bool IsConvenienceMethodMeaningful()
         {
-            return _orderedParameters.Where(parameter => parameter.Convenience != KnownParameters.CancellationTokenParameter).Any(parameter => !IsParameterTypeSame(parameter.Convenience, parameter.Protocol))
+            return _orderedParameters.Where(parameter => parameter.Protocol != KnownParameters.RequestContext && parameter.Protocol != KnownParameters.RequestContextRequired).Any(parameter => !IsParameterTypeSame(parameter.Convenience, parameter.Protocol))
                 || !_returnType.Convenience.Equals(_returnType.Protocol);
         }
 
@@ -382,6 +385,11 @@ private ReturnTypeChain BuildReturnTypes()
                             protocolToConvenience.Add(new ProtocolToConvenienceParameterConverter(protocolParameter, convenienceParameter, null));
                     }
                 }
+                else if (protocolParameter != null)
+                {
+                    // convenience parameter is null - such as CancellationToken in non-azure library
+                    protocolToConvenience.Add(new ProtocolToConvenienceParameterConverter(protocolParameter, convenienceParameter, null));
+                }
             }
             var accessibility = _restClientMethod.Accessibility | Virtual;
             if (generationInfo.IsConvenienceMethodInternal)
@@ -590,7 +598,7 @@ public void AddRequestConditionHeaders(RequestConditionHeaders conditionHeaderFl
         public void AddRequestContext()
         {
             _orderedParameters.Add(new ParameterChain(
-                KnownParameters.CancellationTokenParameter,
+                Configuration.IsBranded ? KnownParameters.CancellationTokenParameter : null, // in non-azure libraries, convenience method no longer takes a `CancellationToken` parameter.
                 ShouldRequestContextOptional() ? KnownParameters.RequestContext : KnownParameters.RequestContextRequired,
                 KnownParameters.RequestContext));
         }
diff --git a/src/AutoRest.CSharp/LowLevel/Output/Samples/DpgOperationSample.cs b/src/AutoRest.CSharp/LowLevel/Output/Samples/DpgOperationSample.cs
index e6c8704af0b..280ba45ca26 100644
--- a/src/AutoRest.CSharp/LowLevel/Output/Samples/DpgOperationSample.cs
+++ b/src/AutoRest.CSharp/LowLevel/Output/Samples/DpgOperationSample.cs
@@ -400,6 +400,7 @@ public static bool ShouldGenerateShortVersion(LowLevelClient client, LowLevelCli
             if (method.ConvenienceMethod is not null)
             {
                 if (method.ConvenienceMethod.Signature.Parameters.Count == method.ProtocolMethodSignature.Parameters.Count - 1 &&
+                    method.ConvenienceMethod.Signature.Parameters.Count > 0 &&
                     !method.ConvenienceMethod.Signature.Parameters.Last().Type.Equals(typeof(CancellationToken)))
                 {
                     bool allEqual = true;
diff --git a/test/UnbrandedProjects/Customized-TypeSpec/src/Generated/SuperClient.cs b/test/UnbrandedProjects/Customized-TypeSpec/src/Generated/SuperClient.cs
index aa62b1658b3..0b522656755 100644
--- a/test/UnbrandedProjects/Customized-TypeSpec/src/Generated/SuperClient.cs
+++ b/test/UnbrandedProjects/Customized-TypeSpec/src/Generated/SuperClient.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace CustomizedTypeSpec.Models
@@ -107,18 +106,16 @@ public virtual ClientResult SayHi(string headParameter, string queryParameter, s
         /// <param name="p2"> The <see cref="string"/> to use. </param>
         /// <param name="p1"> The <see cref="string"/> to use. </param>
         /// <param name="action"> The <see cref="SuperRoundTripModel"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="action"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="p2"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<SuperRoundTripModel>> HelloAgainAsync(string p2, string p1, SuperRoundTripModel action, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<SuperRoundTripModel>> HelloAgainAsync(string p2, string p1, SuperRoundTripModel action)
         {
             Argument.AssertNotNullOrEmpty(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(action, nameof(action));
 
             using BinaryContent content = action.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await HelloAgainAsync(p2, p1, content, options).ConfigureAwait(false);
+            ClientResult result = await HelloAgainAsync(p2, p1, content, null).ConfigureAwait(false);
             return ClientResult.FromValue(SuperRoundTripModel.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -126,18 +123,16 @@ public virtual async Task<ClientResult<SuperRoundTripModel>> HelloAgainAsync(str
         /// <param name="p2"> The <see cref="string"/> to use. </param>
         /// <param name="p1"> The <see cref="string"/> to use. </param>
         /// <param name="action"> The <see cref="SuperRoundTripModel"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="action"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="p2"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<SuperRoundTripModel> HelloAgain(string p2, string p1, SuperRoundTripModel action, CancellationToken cancellationToken = default)
+        public virtual ClientResult<SuperRoundTripModel> HelloAgain(string p2, string p1, SuperRoundTripModel action)
         {
             Argument.AssertNotNullOrEmpty(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(action, nameof(action));
 
             using BinaryContent content = action.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = HelloAgain(p2, p1, content, options);
+            ClientResult result = HelloAgain(p2, p1, content, null);
             return ClientResult.FromValue(SuperRoundTripModel.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -151,7 +146,7 @@ public virtual ClientResult<SuperRoundTripModel> HelloAgain(string p2, string p1
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloAgainAsync(string,string,SuperRoundTripModel,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloAgainAsync(string,string,SuperRoundTripModel)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -184,7 +179,7 @@ public virtual async Task<ClientResult> HelloAgainAsync(string p2, string p1, Bi
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloAgain(string,string,SuperRoundTripModel,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloAgain(string,string,SuperRoundTripModel)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -264,20 +259,16 @@ public virtual ClientResult NoContentType(string p2, string p1, BinaryContent co
         }
 
         /// <summary> Return hi in demo2. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<Thing>> HelloDemo2Async(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> HelloDemo2Async()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await HelloDemo2Async(options).ConfigureAwait(false);
+            ClientResult result = await HelloDemo2Async(null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Return hi in demo2. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<Thing> HelloDemo2(CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> HelloDemo2()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = HelloDemo2(options);
+            ClientResult result = HelloDemo2(null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -291,7 +282,7 @@ public virtual ClientResult<Thing> HelloDemo2(CancellationToken cancellationToke
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloDemo2Async(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloDemo2Async()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -315,7 +306,7 @@ public virtual async Task<ClientResult> HelloDemo2Async(RequestOptions options)
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloDemo2(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloDemo2()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -331,29 +322,25 @@ public virtual ClientResult HelloDemo2(RequestOptions options)
 
         /// <summary> Create with literal value. </summary>
         /// <param name="body"> The <see cref="Thing"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual async Task<ClientResult<Thing>> CreateLiteralAsync(Thing body, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> CreateLiteralAsync(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateLiteralAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateLiteralAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Create with literal value. </summary>
         /// <param name="body"> The <see cref="Thing"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual ClientResult<Thing> CreateLiteral(Thing body, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> CreateLiteral(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = CreateLiteral(content, options);
+            ClientResult result = CreateLiteral(content, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -367,7 +354,7 @@ public virtual ClientResult<Thing> CreateLiteral(Thing body, CancellationToken c
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateLiteralAsync(Thing,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateLiteralAsync(Thing)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -395,7 +382,7 @@ public virtual async Task<ClientResult> CreateLiteralAsync(BinaryContent content
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateLiteral(Thing,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateLiteral(Thing)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -414,20 +401,16 @@ public virtual ClientResult CreateLiteral(BinaryContent content, RequestOptions
         }
 
         /// <summary> Send literal parameters. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<Thing>> HelloLiteralAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> HelloLiteralAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await HelloLiteralAsync(options).ConfigureAwait(false);
+            ClientResult result = await HelloLiteralAsync(null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Send literal parameters. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<Thing> HelloLiteral(CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> HelloLiteral()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = HelloLiteral(options);
+            ClientResult result = HelloLiteral(null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -441,7 +424,7 @@ public virtual ClientResult<Thing> HelloLiteral(CancellationToken cancellationTo
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloLiteralAsync(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloLiteralAsync()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -465,7 +448,7 @@ public virtual async Task<ClientResult> HelloLiteralAsync(RequestOptions options
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloLiteral(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloLiteral()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -481,21 +464,17 @@ public virtual ClientResult HelloLiteral(RequestOptions options)
 
         /// <summary> top level method. </summary>
         /// <param name="action"> The <see cref="DateTimeOffset"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<Thing>> TopActionAsync(DateTimeOffset action, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> TopActionAsync(DateTimeOffset action)
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await TopActionAsync(action, options).ConfigureAwait(false);
+            ClientResult result = await TopActionAsync(action, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> top level method. </summary>
         /// <param name="action"> The <see cref="DateTimeOffset"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<Thing> TopAction(DateTimeOffset action, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> TopAction(DateTimeOffset action)
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = TopAction(action, options);
+            ClientResult result = TopAction(action, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -509,7 +488,7 @@ public virtual ClientResult<Thing> TopAction(DateTimeOffset action, Cancellation
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="TopActionAsync(DateTimeOffset,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="TopActionAsync(DateTimeOffset)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -534,7 +513,7 @@ public virtual async Task<ClientResult> TopActionAsync(DateTimeOffset action, Re
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="TopAction(DateTimeOffset,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="TopAction(DateTimeOffset)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -635,29 +614,25 @@ public virtual ClientResult PatchAction(BinaryContent content, RequestOptions op
 
         /// <summary> body parameter without body decorator. </summary>
         /// <param name="thing"> A model with a few properties of literal types. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="thing"/> is null. </exception>
-        public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(Thing thing, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(Thing thing)
         {
             Argument.AssertNotNull(thing, nameof(thing));
 
             using BinaryContent content = thing.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await AnonymousBodyAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await AnonymousBodyAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> body parameter without body decorator. </summary>
         /// <param name="thing"> A model with a few properties of literal types. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="thing"/> is null. </exception>
-        public virtual ClientResult<Thing> AnonymousBody(Thing thing, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> AnonymousBody(Thing thing)
         {
             Argument.AssertNotNull(thing, nameof(thing));
 
             using BinaryContent content = thing.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = AnonymousBody(content, options);
+            ClientResult result = AnonymousBody(content, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -671,7 +646,7 @@ public virtual ClientResult<Thing> AnonymousBody(Thing thing, CancellationToken
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="AnonymousBodyAsync(Thing,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="AnonymousBodyAsync(Thing)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -699,7 +674,7 @@ public virtual async Task<ClientResult> AnonymousBodyAsync(BinaryContent content
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="AnonymousBody(Thing,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="AnonymousBody(Thing)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -719,29 +694,25 @@ public virtual ClientResult AnonymousBody(BinaryContent content, RequestOptions
 
         /// <summary> Model can have its friendly name. </summary>
         /// <param name="superFriend"> this is not a friendly model but with a friendly name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="superFriend"/> is null. </exception>
-        public virtual async Task<ClientResult<SuperFriend>> FriendlyModelAsync(SuperFriend superFriend, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<SuperFriend>> FriendlyModelAsync(SuperFriend superFriend)
         {
             Argument.AssertNotNull(superFriend, nameof(superFriend));
 
             using BinaryContent content = superFriend.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await FriendlyModelAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await FriendlyModelAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(SuperFriend.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Model can have its friendly name. </summary>
         /// <param name="superFriend"> this is not a friendly model but with a friendly name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="superFriend"/> is null. </exception>
-        public virtual ClientResult<SuperFriend> FriendlyModel(SuperFriend superFriend, CancellationToken cancellationToken = default)
+        public virtual ClientResult<SuperFriend> FriendlyModel(SuperFriend superFriend)
         {
             Argument.AssertNotNull(superFriend, nameof(superFriend));
 
             using BinaryContent content = superFriend.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = FriendlyModel(content, options);
+            ClientResult result = FriendlyModel(content, null);
             return ClientResult.FromValue(SuperFriend.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -755,7 +726,7 @@ public virtual ClientResult<SuperFriend> FriendlyModel(SuperFriend superFriend,
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="FriendlyModelAsync(SuperFriend,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="FriendlyModelAsync(SuperFriend)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -783,7 +754,7 @@ public virtual async Task<ClientResult> FriendlyModelAsync(BinaryContent content
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="FriendlyModel(SuperFriend,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="FriendlyModel(SuperFriend)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -842,30 +813,26 @@ public virtual ClientResult AddTimeHeader(RequestOptions options = null)
         /// <summary> parameter has string format. </summary>
         /// <param name="subscriptionId"> The <see cref="Guid"/> to use. </param>
         /// <param name="body"> The <see cref="ModelWithFormat"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual async Task<ClientResult> StringFormatAsync(Guid subscriptionId, ModelWithFormat body, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult> StringFormatAsync(Guid subscriptionId, ModelWithFormat body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await StringFormatAsync(subscriptionId, content, options).ConfigureAwait(false);
+            ClientResult result = await StringFormatAsync(subscriptionId, content, null).ConfigureAwait(false);
             return result;
         }
 
         /// <summary> parameter has string format. </summary>
         /// <param name="subscriptionId"> The <see cref="Guid"/> to use. </param>
         /// <param name="body"> The <see cref="ModelWithFormat"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual ClientResult StringFormat(Guid subscriptionId, ModelWithFormat body, CancellationToken cancellationToken = default)
+        public virtual ClientResult StringFormat(Guid subscriptionId, ModelWithFormat body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = StringFormat(subscriptionId, content, options);
+            ClientResult result = StringFormat(subscriptionId, content, null);
             return result;
         }
 
@@ -879,7 +846,7 @@ public virtual ClientResult StringFormat(Guid subscriptionId, ModelWithFormat bo
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="StringFormatAsync(Guid,ModelWithFormat,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="StringFormatAsync(Guid,ModelWithFormat)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -908,7 +875,7 @@ public virtual async Task<ClientResult> StringFormatAsync(Guid subscriptionId, B
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="StringFormat(Guid,ModelWithFormat,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="StringFormat(Guid,ModelWithFormat)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -929,29 +896,25 @@ public virtual ClientResult StringFormat(Guid subscriptionId, BinaryContent cont
 
         /// <summary> Model can have its projected name. </summary>
         /// <param name="projectedModel"> this is a model with a projected name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="projectedModel"/> is null. </exception>
-        public virtual async Task<ClientResult<ProjectedModel>> ProjectedNameModelAsync(ProjectedModel projectedModel, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ProjectedModel>> ProjectedNameModelAsync(ProjectedModel projectedModel)
         {
             Argument.AssertNotNull(projectedModel, nameof(projectedModel));
 
             using BinaryContent content = projectedModel.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await ProjectedNameModelAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await ProjectedNameModelAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(ProjectedModel.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Model can have its projected name. </summary>
         /// <param name="projectedModel"> this is a model with a projected name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="projectedModel"/> is null. </exception>
-        public virtual ClientResult<ProjectedModel> ProjectedNameModel(ProjectedModel projectedModel, CancellationToken cancellationToken = default)
+        public virtual ClientResult<ProjectedModel> ProjectedNameModel(ProjectedModel projectedModel)
         {
             Argument.AssertNotNull(projectedModel, nameof(projectedModel));
 
             using BinaryContent content = projectedModel.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = ProjectedNameModel(content, options);
+            ClientResult result = ProjectedNameModel(content, null);
             return ClientResult.FromValue(ProjectedModel.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -965,7 +928,7 @@ public virtual ClientResult<ProjectedModel> ProjectedNameModel(ProjectedModel pr
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="ProjectedNameModelAsync(ProjectedModel,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="ProjectedNameModelAsync(ProjectedModel)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -993,7 +956,7 @@ public virtual async Task<ClientResult> ProjectedNameModelAsync(BinaryContent co
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="ProjectedNameModel(ProjectedModel,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="ProjectedNameModel(ProjectedModel)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -1012,20 +975,16 @@ public virtual ClientResult ProjectedNameModel(BinaryContent content, RequestOpt
         }
 
         /// <summary> return anonymous model. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<ReturnsAnonymousModelResponse>> ReturnsAnonymousModelAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ReturnsAnonymousModelResponse>> ReturnsAnonymousModelAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await ReturnsAnonymousModelAsync(options).ConfigureAwait(false);
+            ClientResult result = await ReturnsAnonymousModelAsync(null).ConfigureAwait(false);
             return ClientResult.FromValue(ReturnsAnonymousModelResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> return anonymous model. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel(CancellationToken cancellationToken = default)
+        public virtual ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = ReturnsAnonymousModel(options);
+            ClientResult result = ReturnsAnonymousModel(null);
             return ClientResult.FromValue(ReturnsAnonymousModelResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -1039,7 +998,7 @@ public virtual ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="ReturnsAnonymousModelAsync(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="ReturnsAnonymousModelAsync()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -1063,7 +1022,7 @@ public virtual async Task<ClientResult> ReturnsAnonymousModelAsync(RequestOption
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="ReturnsAnonymousModel(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="ReturnsAnonymousModel()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -1117,29 +1076,25 @@ public virtual ClientResult GetUnknownValue(RequestOptions options)
 
         /// <summary> When set protocol false and convenient true, then the protocol method should be internal. </summary>
         /// <param name="body"> The <see cref="Thing"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual async Task<ClientResult<Thing>> InternalProtocolAsync(Thing body, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> InternalProtocolAsync(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await InternalProtocolAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await InternalProtocolAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> When set protocol false and convenient true, then the protocol method should be internal. </summary>
         /// <param name="body"> The <see cref="Thing"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual ClientResult<Thing> InternalProtocol(Thing body, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> InternalProtocol(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = InternalProtocol(content, options);
+            ClientResult result = InternalProtocol(content, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -1190,20 +1145,16 @@ internal virtual ClientResult InternalProtocol(BinaryContent content, RequestOpt
         }
 
         /// <summary> When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult> StillConvenientValueAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult> StillConvenientValueAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await StillConvenientAsync(options).ConfigureAwait(false);
+            ClientResult result = await StillConvenientAsync(null).ConfigureAwait(false);
             return result;
         }
 
         /// <summary> When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult StillConvenientValue(CancellationToken cancellationToken = default)
+        public virtual ClientResult StillConvenientValue()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = StillConvenient(options);
+            ClientResult result = StillConvenient(null);
             return result;
         }
 
@@ -1674,17 +1625,6 @@ internal PipelineMessage CreateHeadAsBooleanRequest(string id, RequestOptions op
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
         private static PipelineMessageClassifier _pipelineMessageClassifier204;
diff --git a/test/UnbrandedProjects/NoTest-TypeSpec/src/Generated/NoTestTypeSpecClient.cs b/test/UnbrandedProjects/NoTest-TypeSpec/src/Generated/NoTestTypeSpecClient.cs
index 78b463e494d..157c61000f9 100644
--- a/test/UnbrandedProjects/NoTest-TypeSpec/src/Generated/NoTestTypeSpecClient.cs
+++ b/test/UnbrandedProjects/NoTest-TypeSpec/src/Generated/NoTestTypeSpecClient.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using NoTestTypeSpec.Models;
 
@@ -56,15 +55,13 @@ public NoTestTypeSpecClient(Uri endpoint, ApiKeyCredential credential, NoTestTyp
         /// <param name="headParameter"> The <see cref="string"/> to use. </param>
         /// <param name="queryParameter"> The <see cref="string"/> to use. </param>
         /// <param name="optionalQuery"> The <see cref="string"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        public virtual async Task<ClientResult<Thing>> SayHiAsync(string headParameter, string queryParameter, string optionalQuery = null, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> SayHiAsync(string headParameter, string queryParameter, string optionalQuery = null)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await SayHiAsync(headParameter, queryParameter, optionalQuery, options).ConfigureAwait(false);
+            ClientResult result = await SayHiAsync(headParameter, queryParameter, optionalQuery, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -72,15 +69,13 @@ public virtual async Task<ClientResult<Thing>> SayHiAsync(string headParameter,
         /// <param name="headParameter"> The <see cref="string"/> to use. </param>
         /// <param name="queryParameter"> The <see cref="string"/> to use. </param>
         /// <param name="optionalQuery"> The <see cref="string"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        public virtual ClientResult<Thing> SayHi(string headParameter, string queryParameter, string optionalQuery = null, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> SayHi(string headParameter, string queryParameter, string optionalQuery = null)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = SayHi(headParameter, queryParameter, optionalQuery, options);
+            ClientResult result = SayHi(headParameter, queryParameter, optionalQuery, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -94,7 +89,7 @@ public virtual ClientResult<Thing> SayHi(string headParameter, string queryParam
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="SayHiAsync(string,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="SayHiAsync(string,string,string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -125,7 +120,7 @@ public virtual async Task<ClientResult> SayHiAsync(string headParameter, string
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="SayHi(string,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="SayHi(string,string,string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -170,17 +165,6 @@ internal PipelineMessage CreateSayHiRequest(string headParameter, string queryPa
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/AudioTranscriptions.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/AudioTranscriptions.cs
index d0b80869e6e..c15269ca56a 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/AudioTranscriptions.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/AudioTranscriptions.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -42,29 +41,25 @@ internal AudioTranscriptions(ClientPipeline pipeline, ApiKeyCredential keyCreden
 
         /// <summary> Transcribes audio into the input language. </summary>
         /// <param name="audio"> The <see cref="CreateTranscriptionRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="audio"/> is null. </exception>
-        public virtual async Task<ClientResult<CreateTranscriptionResponse>> CreateAsync(CreateTranscriptionRequest audio, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<CreateTranscriptionResponse>> CreateAsync(CreateTranscriptionRequest audio)
         {
             Argument.AssertNotNull(audio, nameof(audio));
 
             using BinaryContent content = audio.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(CreateTranscriptionResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Transcribes audio into the input language. </summary>
         /// <param name="audio"> The <see cref="CreateTranscriptionRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="audio"/> is null. </exception>
-        public virtual ClientResult<CreateTranscriptionResponse> Create(CreateTranscriptionRequest audio, CancellationToken cancellationToken = default)
+        public virtual ClientResult<CreateTranscriptionResponse> Create(CreateTranscriptionRequest audio)
         {
             Argument.AssertNotNull(audio, nameof(audio));
 
             using BinaryContent content = audio.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(CreateTranscriptionResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -78,7 +73,7 @@ public virtual ClientResult<CreateTranscriptionResponse> Create(CreateTranscript
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateTranscriptionRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateTranscriptionRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -106,7 +101,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateTranscriptionRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateTranscriptionRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -144,17 +139,6 @@ internal PipelineMessage CreateCreateRequest(BinaryContent content, RequestOptio
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/AudioTranslations.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/AudioTranslations.cs
index f18d8ab7cca..00db8a54652 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/AudioTranslations.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/AudioTranslations.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -42,29 +41,25 @@ internal AudioTranslations(ClientPipeline pipeline, ApiKeyCredential keyCredenti
 
         /// <summary> Transcribes audio into the input language. </summary>
         /// <param name="audio"> The <see cref="CreateTranslationRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="audio"/> is null. </exception>
-        public virtual async Task<ClientResult<CreateTranslationResponse>> CreateAsync(CreateTranslationRequest audio, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<CreateTranslationResponse>> CreateAsync(CreateTranslationRequest audio)
         {
             Argument.AssertNotNull(audio, nameof(audio));
 
             using BinaryContent content = audio.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(CreateTranslationResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Transcribes audio into the input language. </summary>
         /// <param name="audio"> The <see cref="CreateTranslationRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="audio"/> is null. </exception>
-        public virtual ClientResult<CreateTranslationResponse> Create(CreateTranslationRequest audio, CancellationToken cancellationToken = default)
+        public virtual ClientResult<CreateTranslationResponse> Create(CreateTranslationRequest audio)
         {
             Argument.AssertNotNull(audio, nameof(audio));
 
             using BinaryContent content = audio.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(CreateTranslationResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -78,7 +73,7 @@ public virtual ClientResult<CreateTranslationResponse> Create(CreateTranslationR
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateTranslationRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateTranslationRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -106,7 +101,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateTranslationRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateTranslationRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -144,17 +139,6 @@ internal PipelineMessage CreateCreateRequest(BinaryContent content, RequestOptio
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/ChatCompletions.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/ChatCompletions.cs
index 0a786dba2b5..8fd8a4b345d 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/ChatCompletions.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/ChatCompletions.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -41,28 +40,24 @@ internal ChatCompletions(ClientPipeline pipeline, ApiKeyCredential keyCredential
         }
 
         /// <param name="createChatCompletionRequest"> The <see cref="CreateChatCompletionRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="createChatCompletionRequest"/> is null. </exception>
-        public virtual async Task<ClientResult<CreateChatCompletionResponse>> CreateAsync(CreateChatCompletionRequest createChatCompletionRequest, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<CreateChatCompletionResponse>> CreateAsync(CreateChatCompletionRequest createChatCompletionRequest)
         {
             Argument.AssertNotNull(createChatCompletionRequest, nameof(createChatCompletionRequest));
 
             using BinaryContent content = createChatCompletionRequest.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(CreateChatCompletionResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <param name="createChatCompletionRequest"> The <see cref="CreateChatCompletionRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="createChatCompletionRequest"/> is null. </exception>
-        public virtual ClientResult<CreateChatCompletionResponse> Create(CreateChatCompletionRequest createChatCompletionRequest, CancellationToken cancellationToken = default)
+        public virtual ClientResult<CreateChatCompletionResponse> Create(CreateChatCompletionRequest createChatCompletionRequest)
         {
             Argument.AssertNotNull(createChatCompletionRequest, nameof(createChatCompletionRequest));
 
             using BinaryContent content = createChatCompletionRequest.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(CreateChatCompletionResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -76,7 +71,7 @@ public virtual ClientResult<CreateChatCompletionResponse> Create(CreateChatCompl
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateChatCompletionRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateChatCompletionRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -104,7 +99,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateChatCompletionRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateChatCompletionRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -142,17 +137,6 @@ internal PipelineMessage CreateCreateRequest(BinaryContent content, RequestOptio
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Completions.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Completions.cs
index 1042d5ada68..95c01d1c40f 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Completions.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Completions.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -41,28 +40,24 @@ internal Completions(ClientPipeline pipeline, ApiKeyCredential keyCredential, Ur
         }
 
         /// <param name="createCompletionRequest"> The <see cref="CreateCompletionRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="createCompletionRequest"/> is null. </exception>
-        public virtual async Task<ClientResult<CreateCompletionResponse>> CreateAsync(CreateCompletionRequest createCompletionRequest, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<CreateCompletionResponse>> CreateAsync(CreateCompletionRequest createCompletionRequest)
         {
             Argument.AssertNotNull(createCompletionRequest, nameof(createCompletionRequest));
 
             using BinaryContent content = createCompletionRequest.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(CreateCompletionResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <param name="createCompletionRequest"> The <see cref="CreateCompletionRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="createCompletionRequest"/> is null. </exception>
-        public virtual ClientResult<CreateCompletionResponse> Create(CreateCompletionRequest createCompletionRequest, CancellationToken cancellationToken = default)
+        public virtual ClientResult<CreateCompletionResponse> Create(CreateCompletionRequest createCompletionRequest)
         {
             Argument.AssertNotNull(createCompletionRequest, nameof(createCompletionRequest));
 
             using BinaryContent content = createCompletionRequest.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(CreateCompletionResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -76,7 +71,7 @@ public virtual ClientResult<CreateCompletionResponse> Create(CreateCompletionReq
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateCompletionRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateCompletionRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -104,7 +99,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateCompletionRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateCompletionRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -142,17 +137,6 @@ internal PipelineMessage CreateCreateRequest(BinaryContent content, RequestOptio
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Edits.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Edits.cs
index 824ecfe05aa..cf30ef82d8b 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Edits.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Edits.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -41,30 +40,26 @@ internal Edits(ClientPipeline pipeline, ApiKeyCredential keyCredential, Uri endp
         }
 
         /// <param name="edit"> The <see cref="CreateEditRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="edit"/> is null. </exception>
         [Obsolete("deprecated")]
-        public virtual async Task<ClientResult<CreateEditResponse>> CreateAsync(CreateEditRequest edit, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<CreateEditResponse>> CreateAsync(CreateEditRequest edit)
         {
             Argument.AssertNotNull(edit, nameof(edit));
 
             using BinaryContent content = edit.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(CreateEditResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <param name="edit"> The <see cref="CreateEditRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="edit"/> is null. </exception>
         [Obsolete("deprecated")]
-        public virtual ClientResult<CreateEditResponse> Create(CreateEditRequest edit, CancellationToken cancellationToken = default)
+        public virtual ClientResult<CreateEditResponse> Create(CreateEditRequest edit)
         {
             Argument.AssertNotNull(edit, nameof(edit));
 
             using BinaryContent content = edit.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(CreateEditResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -78,7 +73,7 @@ public virtual ClientResult<CreateEditResponse> Create(CreateEditRequest edit, C
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateEditRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateEditRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -107,7 +102,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateEditRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateEditRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -146,17 +141,6 @@ internal PipelineMessage CreateCreateRequest(BinaryContent content, RequestOptio
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Embeddings.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Embeddings.cs
index c0359f6ef45..9c04b76140f 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Embeddings.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Embeddings.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -42,29 +41,25 @@ internal Embeddings(ClientPipeline pipeline, ApiKeyCredential keyCredential, Uri
 
         /// <summary> Creates an embedding vector representing the input text. </summary>
         /// <param name="embedding"> The <see cref="CreateEmbeddingRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="embedding"/> is null. </exception>
-        public virtual async Task<ClientResult<CreateEmbeddingResponse>> CreateAsync(CreateEmbeddingRequest embedding, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<CreateEmbeddingResponse>> CreateAsync(CreateEmbeddingRequest embedding)
         {
             Argument.AssertNotNull(embedding, nameof(embedding));
 
             using BinaryContent content = embedding.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(CreateEmbeddingResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Creates an embedding vector representing the input text. </summary>
         /// <param name="embedding"> The <see cref="CreateEmbeddingRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="embedding"/> is null. </exception>
-        public virtual ClientResult<CreateEmbeddingResponse> Create(CreateEmbeddingRequest embedding, CancellationToken cancellationToken = default)
+        public virtual ClientResult<CreateEmbeddingResponse> Create(CreateEmbeddingRequest embedding)
         {
             Argument.AssertNotNull(embedding, nameof(embedding));
 
             using BinaryContent content = embedding.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(CreateEmbeddingResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -78,7 +73,7 @@ public virtual ClientResult<CreateEmbeddingResponse> Create(CreateEmbeddingReque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateEmbeddingRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateEmbeddingRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -106,7 +101,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateEmbeddingRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateEmbeddingRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -144,17 +139,6 @@ internal PipelineMessage CreateCreateRequest(BinaryContent content, RequestOptio
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Files.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Files.cs
index ed2e928d5f5..f381e78003b 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Files.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Files.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -41,20 +40,16 @@ internal Files(ClientPipeline pipeline, ApiKeyCredential keyCredential, Uri endp
         }
 
         /// <summary> Returns a list of files that belong to the user's organization. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<ListFilesResponse>> GetFilesAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ListFilesResponse>> GetFilesAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await GetFilesAsync(options).ConfigureAwait(false);
+            ClientResult result = await GetFilesAsync(null).ConfigureAwait(false);
             return ClientResult.FromValue(ListFilesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Returns a list of files that belong to the user's organization. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<ListFilesResponse> GetFiles(CancellationToken cancellationToken = default)
+        public virtual ClientResult<ListFilesResponse> GetFiles()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = GetFiles(options);
+            ClientResult result = GetFiles(null);
             return ClientResult.FromValue(ListFilesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -68,7 +63,7 @@ public virtual ClientResult<ListFilesResponse> GetFiles(CancellationToken cancel
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetFilesAsync(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetFilesAsync()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -92,7 +87,7 @@ public virtual async Task<ClientResult> GetFilesAsync(RequestOptions options)
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetFiles(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetFiles()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -108,29 +103,25 @@ public virtual ClientResult GetFiles(RequestOptions options)
 
         /// <summary> Returns a list of files that belong to the user's organization. </summary>
         /// <param name="file"> The <see cref="CreateFileRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="file"/> is null. </exception>
-        public virtual async Task<ClientResult<OpenAIFile>> CreateAsync(CreateFileRequest file, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<OpenAIFile>> CreateAsync(CreateFileRequest file)
         {
             Argument.AssertNotNull(file, nameof(file));
 
             using BinaryContent content = file.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(OpenAIFile.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Returns a list of files that belong to the user's organization. </summary>
         /// <param name="file"> The <see cref="CreateFileRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="file"/> is null. </exception>
-        public virtual ClientResult<OpenAIFile> Create(CreateFileRequest file, CancellationToken cancellationToken = default)
+        public virtual ClientResult<OpenAIFile> Create(CreateFileRequest file)
         {
             Argument.AssertNotNull(file, nameof(file));
 
             using BinaryContent content = file.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(OpenAIFile.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -144,7 +135,7 @@ public virtual ClientResult<OpenAIFile> Create(CreateFileRequest file, Cancellat
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateFileRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateFileRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -172,7 +163,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateFileRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateFileRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -192,29 +183,25 @@ public virtual ClientResult Create(BinaryContent content, RequestOptions options
 
         /// <summary> Returns information about a specific file. </summary>
         /// <param name="fileId"> The ID of the file to use for this request. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<OpenAIFile>> RetrieveAsync(string fileId, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<OpenAIFile>> RetrieveAsync(string fileId)
         {
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await RetrieveAsync(fileId, options).ConfigureAwait(false);
+            ClientResult result = await RetrieveAsync(fileId, null).ConfigureAwait(false);
             return ClientResult.FromValue(OpenAIFile.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Returns information about a specific file. </summary>
         /// <param name="fileId"> The ID of the file to use for this request. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<OpenAIFile> Retrieve(string fileId, CancellationToken cancellationToken = default)
+        public virtual ClientResult<OpenAIFile> Retrieve(string fileId)
         {
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Retrieve(fileId, options);
+            ClientResult result = Retrieve(fileId, null);
             return ClientResult.FromValue(OpenAIFile.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -228,7 +215,7 @@ public virtual ClientResult<OpenAIFile> Retrieve(string fileId, CancellationToke
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="RetrieveAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="RetrieveAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -257,7 +244,7 @@ public virtual async Task<ClientResult> RetrieveAsync(string fileId, RequestOpti
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Retrieve(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Retrieve(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -278,29 +265,25 @@ public virtual ClientResult Retrieve(string fileId, RequestOptions options)
 
         /// <summary> Delete a file. </summary>
         /// <param name="fileId"> The ID of the file to use for this request. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<DeleteFileResponse>> DeleteAsync(string fileId, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<DeleteFileResponse>> DeleteAsync(string fileId)
         {
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await DeleteAsync(fileId, options).ConfigureAwait(false);
+            ClientResult result = await DeleteAsync(fileId, null).ConfigureAwait(false);
             return ClientResult.FromValue(DeleteFileResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Delete a file. </summary>
         /// <param name="fileId"> The ID of the file to use for this request. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<DeleteFileResponse> Delete(string fileId, CancellationToken cancellationToken = default)
+        public virtual ClientResult<DeleteFileResponse> Delete(string fileId)
         {
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Delete(fileId, options);
+            ClientResult result = Delete(fileId, null);
             return ClientResult.FromValue(DeleteFileResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -314,7 +297,7 @@ public virtual ClientResult<DeleteFileResponse> Delete(string fileId, Cancellati
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="DeleteAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="DeleteAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -343,7 +326,7 @@ public virtual async Task<ClientResult> DeleteAsync(string fileId, RequestOption
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Delete(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Delete(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -364,29 +347,25 @@ public virtual ClientResult Delete(string fileId, RequestOptions options)
 
         /// <summary> Returns the contents of the specified file. </summary>
         /// <param name="fileId"> The ID of the file to use for this request. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<string>> DownloadAsync(string fileId, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<string>> DownloadAsync(string fileId)
         {
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await DownloadAsync(fileId, options).ConfigureAwait(false);
+            ClientResult result = await DownloadAsync(fileId, null).ConfigureAwait(false);
             return ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
         }
 
         /// <summary> Returns the contents of the specified file. </summary>
         /// <param name="fileId"> The ID of the file to use for this request. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<string> Download(string fileId, CancellationToken cancellationToken = default)
+        public virtual ClientResult<string> Download(string fileId)
         {
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Download(fileId, options);
+            ClientResult result = Download(fileId, null);
             return ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
         }
 
@@ -400,7 +379,7 @@ public virtual ClientResult<string> Download(string fileId, CancellationToken ca
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="DownloadAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="DownloadAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -429,7 +408,7 @@ public virtual async Task<ClientResult> DownloadAsync(string fileId, RequestOpti
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Download(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Download(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -544,17 +523,6 @@ internal PipelineMessage CreateDownloadRequest(string fileId, RequestOptions opt
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/FineTunes.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/FineTunes.cs
index d15e70a697b..3f21f3fd521 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/FineTunes.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/FineTunes.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -48,16 +47,14 @@ internal FineTunes(ClientPipeline pipeline, ApiKeyCredential keyCredential, Uri
         /// [Learn more about fine-tuning](/docs/guides/legacy-fine-tuning)
         /// </summary>
         /// <param name="fineTune"> The <see cref="CreateFineTuneRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTune"/> is null. </exception>
         [Obsolete("deprecated")]
-        public virtual async Task<ClientResult<FineTune>> CreateAsync(CreateFineTuneRequest fineTune, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<FineTune>> CreateAsync(CreateFineTuneRequest fineTune)
         {
             Argument.AssertNotNull(fineTune, nameof(fineTune));
 
             using BinaryContent content = fineTune.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(FineTune.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -69,16 +66,14 @@ public virtual async Task<ClientResult<FineTune>> CreateAsync(CreateFineTuneRequ
         /// [Learn more about fine-tuning](/docs/guides/legacy-fine-tuning)
         /// </summary>
         /// <param name="fineTune"> The <see cref="CreateFineTuneRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTune"/> is null. </exception>
         [Obsolete("deprecated")]
-        public virtual ClientResult<FineTune> Create(CreateFineTuneRequest fineTune, CancellationToken cancellationToken = default)
+        public virtual ClientResult<FineTune> Create(CreateFineTuneRequest fineTune)
         {
             Argument.AssertNotNull(fineTune, nameof(fineTune));
 
             using BinaryContent content = fineTune.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(FineTune.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -96,7 +91,7 @@ public virtual ClientResult<FineTune> Create(CreateFineTuneRequest fineTune, Can
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateFineTuneRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateFineTuneRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -129,7 +124,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateFineTuneRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateFineTuneRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -149,22 +144,18 @@ public virtual ClientResult Create(BinaryContent content, RequestOptions options
         }
 
         /// <summary> List your organization's fine-tuning jobs. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         [Obsolete("deprecated")]
-        public virtual async Task<ClientResult<ListFineTunesResponse>> GetFineTunesAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ListFineTunesResponse>> GetFineTunesAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await GetFineTunesAsync(options).ConfigureAwait(false);
+            ClientResult result = await GetFineTunesAsync(null).ConfigureAwait(false);
             return ClientResult.FromValue(ListFineTunesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> List your organization's fine-tuning jobs. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         [Obsolete("deprecated")]
-        public virtual ClientResult<ListFineTunesResponse> GetFineTunes(CancellationToken cancellationToken = default)
+        public virtual ClientResult<ListFineTunesResponse> GetFineTunes()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = GetFineTunes(options);
+            ClientResult result = GetFineTunes(null);
             return ClientResult.FromValue(ListFineTunesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -178,7 +169,7 @@ public virtual ClientResult<ListFineTunesResponse> GetFineTunes(CancellationToke
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetFineTunesAsync(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetFineTunesAsync()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -203,7 +194,7 @@ public virtual async Task<ClientResult> GetFineTunesAsync(RequestOptions options
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetFineTunes(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetFineTunes()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -224,16 +215,14 @@ public virtual ClientResult GetFineTunes(RequestOptions options)
         /// [Learn more about fine-tuning](/docs/guides/legacy-fine-tuning)
         /// </summary>
         /// <param name="fineTuneId"> The ID of the fine-tune job. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuneId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuneId"/> is an empty string, and was expected to be non-empty. </exception>
         [Obsolete("deprecated")]
-        public virtual async Task<ClientResult<FineTune>> RetrieveAsync(string fineTuneId, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<FineTune>> RetrieveAsync(string fineTuneId)
         {
             Argument.AssertNotNullOrEmpty(fineTuneId, nameof(fineTuneId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await RetrieveAsync(fineTuneId, options).ConfigureAwait(false);
+            ClientResult result = await RetrieveAsync(fineTuneId, null).ConfigureAwait(false);
             return ClientResult.FromValue(FineTune.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -243,16 +232,14 @@ public virtual async Task<ClientResult<FineTune>> RetrieveAsync(string fineTuneI
         /// [Learn more about fine-tuning](/docs/guides/legacy-fine-tuning)
         /// </summary>
         /// <param name="fineTuneId"> The ID of the fine-tune job. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuneId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuneId"/> is an empty string, and was expected to be non-empty. </exception>
         [Obsolete("deprecated")]
-        public virtual ClientResult<FineTune> Retrieve(string fineTuneId, CancellationToken cancellationToken = default)
+        public virtual ClientResult<FineTune> Retrieve(string fineTuneId)
         {
             Argument.AssertNotNullOrEmpty(fineTuneId, nameof(fineTuneId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Retrieve(fineTuneId, options);
+            ClientResult result = Retrieve(fineTuneId, null);
             return ClientResult.FromValue(FineTune.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -268,7 +255,7 @@ public virtual ClientResult<FineTune> Retrieve(string fineTuneId, CancellationTo
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="RetrieveAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="RetrieveAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -300,7 +287,7 @@ public virtual async Task<ClientResult> RetrieveAsync(string fineTuneId, Request
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Retrieve(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Retrieve(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -331,16 +318,14 @@ public virtual ClientResult Retrieve(string fineTuneId, RequestOptions options)
         ///
         /// If set to false, only events generated so far will be returned.
         /// </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuneId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuneId"/> is an empty string, and was expected to be non-empty. </exception>
         [Obsolete("deprecated")]
-        public virtual async Task<ClientResult<ListFineTuneEventsResponse>> GetEventsAsync(string fineTuneId, bool? stream = null, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ListFineTuneEventsResponse>> GetEventsAsync(string fineTuneId, bool? stream = null)
         {
             Argument.AssertNotNullOrEmpty(fineTuneId, nameof(fineTuneId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await GetEventsAsync(fineTuneId, stream, options).ConfigureAwait(false);
+            ClientResult result = await GetEventsAsync(fineTuneId, stream, null).ConfigureAwait(false);
             return ClientResult.FromValue(ListFineTuneEventsResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -355,16 +340,14 @@ public virtual async Task<ClientResult<ListFineTuneEventsResponse>> GetEventsAsy
         ///
         /// If set to false, only events generated so far will be returned.
         /// </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuneId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuneId"/> is an empty string, and was expected to be non-empty. </exception>
         [Obsolete("deprecated")]
-        public virtual ClientResult<ListFineTuneEventsResponse> GetEvents(string fineTuneId, bool? stream = null, CancellationToken cancellationToken = default)
+        public virtual ClientResult<ListFineTuneEventsResponse> GetEvents(string fineTuneId, bool? stream = null)
         {
             Argument.AssertNotNullOrEmpty(fineTuneId, nameof(fineTuneId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = GetEvents(fineTuneId, stream, options);
+            ClientResult result = GetEvents(fineTuneId, stream, null);
             return ClientResult.FromValue(ListFineTuneEventsResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -378,7 +361,7 @@ public virtual ClientResult<ListFineTuneEventsResponse> GetEvents(string fineTun
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetEventsAsync(string,bool?,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetEventsAsync(string,bool?)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -417,7 +400,7 @@ public virtual async Task<ClientResult> GetEventsAsync(string fineTuneId, bool?
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetEvents(string,bool?,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetEvents(string,bool?)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -448,31 +431,27 @@ public virtual ClientResult GetEvents(string fineTuneId, bool? stream, RequestOp
 
         /// <summary> Immediately cancel a fine-tune job. </summary>
         /// <param name="fineTuneId"> The ID of the fine-tune job to cancel. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuneId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuneId"/> is an empty string, and was expected to be non-empty. </exception>
         [Obsolete("deprecated")]
-        public virtual async Task<ClientResult<FineTune>> CancelAsync(string fineTuneId, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<FineTune>> CancelAsync(string fineTuneId)
         {
             Argument.AssertNotNullOrEmpty(fineTuneId, nameof(fineTuneId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CancelAsync(fineTuneId, options).ConfigureAwait(false);
+            ClientResult result = await CancelAsync(fineTuneId, null).ConfigureAwait(false);
             return ClientResult.FromValue(FineTune.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Immediately cancel a fine-tune job. </summary>
         /// <param name="fineTuneId"> The ID of the fine-tune job to cancel. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuneId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuneId"/> is an empty string, and was expected to be non-empty. </exception>
         [Obsolete("deprecated")]
-        public virtual ClientResult<FineTune> Cancel(string fineTuneId, CancellationToken cancellationToken = default)
+        public virtual ClientResult<FineTune> Cancel(string fineTuneId)
         {
             Argument.AssertNotNullOrEmpty(fineTuneId, nameof(fineTuneId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Cancel(fineTuneId, options);
+            ClientResult result = Cancel(fineTuneId, null);
             return ClientResult.FromValue(FineTune.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -486,7 +465,7 @@ public virtual ClientResult<FineTune> Cancel(string fineTuneId, CancellationToke
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CancelAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CancelAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -516,7 +495,7 @@ public virtual async Task<ClientResult> CancelAsync(string fineTuneId, RequestOp
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Cancel(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Cancel(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -637,17 +616,6 @@ internal PipelineMessage CreateCancelRequest(string fineTuneId, RequestOptions o
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/FineTuningJobs.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/FineTuningJobs.cs
index 2ccd8d6accd..6b9db4d5658 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/FineTuningJobs.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/FineTuningJobs.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -49,15 +48,13 @@ internal FineTuningJobs(ClientPipeline pipeline, ApiKeyCredential keyCredential,
         /// [Learn more about fine-tuning](/docs/guides/fine-tuning)
         /// </summary>
         /// <param name="job"> The <see cref="CreateFineTuningJobRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="job"/> is null. </exception>
-        public virtual async Task<ClientResult<FineTuningJob>> CreateAsync(CreateFineTuningJobRequest job, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<FineTuningJob>> CreateAsync(CreateFineTuningJobRequest job)
         {
             Argument.AssertNotNull(job, nameof(job));
 
             using BinaryContent content = job.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(FineTuningJob.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -70,15 +67,13 @@ public virtual async Task<ClientResult<FineTuningJob>> CreateAsync(CreateFineTun
         /// [Learn more about fine-tuning](/docs/guides/fine-tuning)
         /// </summary>
         /// <param name="job"> The <see cref="CreateFineTuningJobRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="job"/> is null. </exception>
-        public virtual ClientResult<FineTuningJob> Create(CreateFineTuningJobRequest job, CancellationToken cancellationToken = default)
+        public virtual ClientResult<FineTuningJob> Create(CreateFineTuningJobRequest job)
         {
             Argument.AssertNotNull(job, nameof(job));
 
             using BinaryContent content = job.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(FineTuningJob.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -97,7 +92,7 @@ public virtual ClientResult<FineTuningJob> Create(CreateFineTuningJobRequest job
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateFineTuningJobRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateFineTuningJobRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -130,7 +125,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateFineTuningJobRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateFineTuningJobRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -150,21 +145,17 @@ public virtual ClientResult Create(BinaryContent content, RequestOptions options
 
         /// <param name="after"> Identifier for the last job from the previous pagination request. </param>
         /// <param name="limit"> Number of fine-tuning jobs to retrieve. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<ListPaginatedFineTuningJobsResponse>> GetPaginatedsAsync(string after = null, long? limit = null, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ListPaginatedFineTuningJobsResponse>> GetPaginatedsAsync(string after = null, long? limit = null)
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await GetPaginatedsAsync(after, limit, options).ConfigureAwait(false);
+            ClientResult result = await GetPaginatedsAsync(after, limit, null).ConfigureAwait(false);
             return ClientResult.FromValue(ListPaginatedFineTuningJobsResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <param name="after"> Identifier for the last job from the previous pagination request. </param>
         /// <param name="limit"> Number of fine-tuning jobs to retrieve. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<ListPaginatedFineTuningJobsResponse> GetPaginateds(string after = null, long? limit = null, CancellationToken cancellationToken = default)
+        public virtual ClientResult<ListPaginatedFineTuningJobsResponse> GetPaginateds(string after = null, long? limit = null)
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = GetPaginateds(after, limit, options);
+            ClientResult result = GetPaginateds(after, limit, null);
             return ClientResult.FromValue(ListPaginatedFineTuningJobsResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -178,7 +169,7 @@ public virtual ClientResult<ListPaginatedFineTuningJobsResponse> GetPaginateds(s
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetPaginatedsAsync(string,long?,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetPaginatedsAsync(string,long?)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -204,7 +195,7 @@ public virtual async Task<ClientResult> GetPaginatedsAsync(string after, long? l
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetPaginateds(string,long?,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetPaginateds(string,long?)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -226,15 +217,13 @@ public virtual ClientResult GetPaginateds(string after, long? limit, RequestOpti
         /// [Learn more about fine-tuning](/docs/guides/fine-tuning)
         /// </summary>
         /// <param name="fineTuningJobId"> The <see cref="string"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuningJobId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuningJobId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<FineTuningJob>> RetrieveAsync(string fineTuningJobId, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<FineTuningJob>> RetrieveAsync(string fineTuningJobId)
         {
             Argument.AssertNotNullOrEmpty(fineTuningJobId, nameof(fineTuningJobId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await RetrieveAsync(fineTuningJobId, options).ConfigureAwait(false);
+            ClientResult result = await RetrieveAsync(fineTuningJobId, null).ConfigureAwait(false);
             return ClientResult.FromValue(FineTuningJob.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -244,15 +233,13 @@ public virtual async Task<ClientResult<FineTuningJob>> RetrieveAsync(string fine
         /// [Learn more about fine-tuning](/docs/guides/fine-tuning)
         /// </summary>
         /// <param name="fineTuningJobId"> The <see cref="string"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuningJobId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuningJobId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<FineTuningJob> Retrieve(string fineTuningJobId, CancellationToken cancellationToken = default)
+        public virtual ClientResult<FineTuningJob> Retrieve(string fineTuningJobId)
         {
             Argument.AssertNotNullOrEmpty(fineTuningJobId, nameof(fineTuningJobId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Retrieve(fineTuningJobId, options);
+            ClientResult result = Retrieve(fineTuningJobId, null);
             return ClientResult.FromValue(FineTuningJob.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -268,7 +255,7 @@ public virtual ClientResult<FineTuningJob> Retrieve(string fineTuningJobId, Canc
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="RetrieveAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="RetrieveAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -299,7 +286,7 @@ public virtual async Task<ClientResult> RetrieveAsync(string fineTuningJobId, Re
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Retrieve(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Retrieve(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -322,15 +309,13 @@ public virtual ClientResult Retrieve(string fineTuningJobId, RequestOptions opti
         /// <param name="fineTuningJobId"> The ID of the fine-tuning job to get events for. </param>
         /// <param name="after"> Identifier for the last event from the previous pagination request. </param>
         /// <param name="limit"> Number of events to retrieve. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuningJobId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuningJobId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<ListFineTuningJobEventsResponse>> GetEventsAsync(string fineTuningJobId, string after = null, long? limit = null, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ListFineTuningJobEventsResponse>> GetEventsAsync(string fineTuningJobId, string after = null, long? limit = null)
         {
             Argument.AssertNotNullOrEmpty(fineTuningJobId, nameof(fineTuningJobId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await GetEventsAsync(fineTuningJobId, after, limit, options).ConfigureAwait(false);
+            ClientResult result = await GetEventsAsync(fineTuningJobId, after, limit, null).ConfigureAwait(false);
             return ClientResult.FromValue(ListFineTuningJobEventsResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -338,15 +323,13 @@ public virtual async Task<ClientResult<ListFineTuningJobEventsResponse>> GetEven
         /// <param name="fineTuningJobId"> The ID of the fine-tuning job to get events for. </param>
         /// <param name="after"> Identifier for the last event from the previous pagination request. </param>
         /// <param name="limit"> Number of events to retrieve. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuningJobId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuningJobId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<ListFineTuningJobEventsResponse> GetEvents(string fineTuningJobId, string after = null, long? limit = null, CancellationToken cancellationToken = default)
+        public virtual ClientResult<ListFineTuningJobEventsResponse> GetEvents(string fineTuningJobId, string after = null, long? limit = null)
         {
             Argument.AssertNotNullOrEmpty(fineTuningJobId, nameof(fineTuningJobId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = GetEvents(fineTuningJobId, after, limit, options);
+            ClientResult result = GetEvents(fineTuningJobId, after, limit, null);
             return ClientResult.FromValue(ListFineTuningJobEventsResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -360,7 +343,7 @@ public virtual ClientResult<ListFineTuningJobEventsResponse> GetEvents(string fi
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetEventsAsync(string,string,long?,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetEventsAsync(string,string,long?)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -391,7 +374,7 @@ public virtual async Task<ClientResult> GetEventsAsync(string fineTuningJobId, s
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetEvents(string,string,long?,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetEvents(string,string,long?)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -414,29 +397,25 @@ public virtual ClientResult GetEvents(string fineTuningJobId, string after, long
 
         /// <summary> Immediately cancel a fine-tune job. </summary>
         /// <param name="fineTuningJobId"> The ID of the fine-tuning job to cancel. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuningJobId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuningJobId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<FineTuningJob>> CancelAsync(string fineTuningJobId, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<FineTuningJob>> CancelAsync(string fineTuningJobId)
         {
             Argument.AssertNotNullOrEmpty(fineTuningJobId, nameof(fineTuningJobId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CancelAsync(fineTuningJobId, options).ConfigureAwait(false);
+            ClientResult result = await CancelAsync(fineTuningJobId, null).ConfigureAwait(false);
             return ClientResult.FromValue(FineTuningJob.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Immediately cancel a fine-tune job. </summary>
         /// <param name="fineTuningJobId"> The ID of the fine-tuning job to cancel. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fineTuningJobId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="fineTuningJobId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<FineTuningJob> Cancel(string fineTuningJobId, CancellationToken cancellationToken = default)
+        public virtual ClientResult<FineTuningJob> Cancel(string fineTuningJobId)
         {
             Argument.AssertNotNullOrEmpty(fineTuningJobId, nameof(fineTuningJobId));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Cancel(fineTuningJobId, options);
+            ClientResult result = Cancel(fineTuningJobId, null);
             return ClientResult.FromValue(FineTuningJob.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -450,7 +429,7 @@ public virtual ClientResult<FineTuningJob> Cancel(string fineTuningJobId, Cancel
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CancelAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CancelAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -479,7 +458,7 @@ public virtual async Task<ClientResult> CancelAsync(string fineTuningJobId, Requ
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Cancel(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Cancel(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -611,17 +590,6 @@ internal PipelineMessage CreateCancelRequest(string fineTuningJobId, RequestOpti
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Images.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Images.cs
index 20349e8fbb3..a6aed9ce3c2 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Images.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Images.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -42,29 +41,25 @@ internal Images(ClientPipeline pipeline, ApiKeyCredential keyCredential, Uri end
 
         /// <summary> Creates an image given a prompt. </summary>
         /// <param name="image"> The <see cref="CreateImageRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="image"/> is null. </exception>
-        public virtual async Task<ClientResult<ImagesResponse>> CreateAsync(CreateImageRequest image, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ImagesResponse>> CreateAsync(CreateImageRequest image)
         {
             Argument.AssertNotNull(image, nameof(image));
 
             using BinaryContent content = image.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(ImagesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Creates an image given a prompt. </summary>
         /// <param name="image"> The <see cref="CreateImageRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="image"/> is null. </exception>
-        public virtual ClientResult<ImagesResponse> Create(CreateImageRequest image, CancellationToken cancellationToken = default)
+        public virtual ClientResult<ImagesResponse> Create(CreateImageRequest image)
         {
             Argument.AssertNotNull(image, nameof(image));
 
             using BinaryContent content = image.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content, options);
+            ClientResult result = Create(content, null);
             return ClientResult.FromValue(ImagesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -78,7 +73,7 @@ public virtual ClientResult<ImagesResponse> Create(CreateImageRequest image, Can
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateImageRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateImageRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -106,7 +101,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateImageRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateImageRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -126,29 +121,25 @@ public virtual ClientResult Create(BinaryContent content, RequestOptions options
 
         /// <summary> Creates an edited or extended image given an original image and a prompt. </summary>
         /// <param name="image"> The <see cref="CreateImageEditRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="image"/> is null. </exception>
-        public virtual async Task<ClientResult<ImagesResponse>> CreateEditAsync(CreateImageEditRequest image, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ImagesResponse>> CreateEditAsync(CreateImageEditRequest image)
         {
             Argument.AssertNotNull(image, nameof(image));
 
             using BinaryContent content = image.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateEditAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateEditAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(ImagesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Creates an edited or extended image given an original image and a prompt. </summary>
         /// <param name="image"> The <see cref="CreateImageEditRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="image"/> is null. </exception>
-        public virtual ClientResult<ImagesResponse> CreateEdit(CreateImageEditRequest image, CancellationToken cancellationToken = default)
+        public virtual ClientResult<ImagesResponse> CreateEdit(CreateImageEditRequest image)
         {
             Argument.AssertNotNull(image, nameof(image));
 
             using BinaryContent content = image.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = CreateEdit(content, options);
+            ClientResult result = CreateEdit(content, null);
             return ClientResult.FromValue(ImagesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -162,7 +153,7 @@ public virtual ClientResult<ImagesResponse> CreateEdit(CreateImageEditRequest im
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateEditAsync(CreateImageEditRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateEditAsync(CreateImageEditRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -190,7 +181,7 @@ public virtual async Task<ClientResult> CreateEditAsync(BinaryContent content, R
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateEdit(CreateImageEditRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateEdit(CreateImageEditRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -210,29 +201,25 @@ public virtual ClientResult CreateEdit(BinaryContent content, RequestOptions opt
 
         /// <summary> Creates an edited or extended image given an original image and a prompt. </summary>
         /// <param name="image"> The <see cref="CreateImageVariationRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="image"/> is null. </exception>
-        public virtual async Task<ClientResult<ImagesResponse>> CreateVariationAsync(CreateImageVariationRequest image, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ImagesResponse>> CreateVariationAsync(CreateImageVariationRequest image)
         {
             Argument.AssertNotNull(image, nameof(image));
 
             using BinaryContent content = image.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateVariationAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateVariationAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(ImagesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Creates an edited or extended image given an original image and a prompt. </summary>
         /// <param name="image"> The <see cref="CreateImageVariationRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="image"/> is null. </exception>
-        public virtual ClientResult<ImagesResponse> CreateVariation(CreateImageVariationRequest image, CancellationToken cancellationToken = default)
+        public virtual ClientResult<ImagesResponse> CreateVariation(CreateImageVariationRequest image)
         {
             Argument.AssertNotNull(image, nameof(image));
 
             using BinaryContent content = image.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = CreateVariation(content, options);
+            ClientResult result = CreateVariation(content, null);
             return ClientResult.FromValue(ImagesResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -246,7 +233,7 @@ public virtual ClientResult<ImagesResponse> CreateVariation(CreateImageVariation
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateVariationAsync(CreateImageVariationRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateVariationAsync(CreateImageVariationRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -274,7 +261,7 @@ public virtual async Task<ClientResult> CreateVariationAsync(BinaryContent conte
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateVariation(CreateImageVariationRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateVariation(CreateImageVariationRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -352,17 +339,6 @@ internal PipelineMessage CreateCreateVariationRequest(BinaryContent content, Req
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/ModelsOps.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/ModelsOps.cs
index ec180df35c1..b647f0ddc3c 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/ModelsOps.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/ModelsOps.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -44,11 +43,9 @@ internal ModelsOps(ClientPipeline pipeline, ApiKeyCredential keyCredential, Uri
         /// Lists the currently available models, and provides basic information about each one such as the
         /// owner and availability.
         /// </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<ListModelsResponse>> GetModelsAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ListModelsResponse>> GetModelsAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await GetModelsAsync(options).ConfigureAwait(false);
+            ClientResult result = await GetModelsAsync(null).ConfigureAwait(false);
             return ClientResult.FromValue(ListModelsResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -56,11 +53,9 @@ public virtual async Task<ClientResult<ListModelsResponse>> GetModelsAsync(Cance
         /// Lists the currently available models, and provides basic information about each one such as the
         /// owner and availability.
         /// </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<ListModelsResponse> GetModels(CancellationToken cancellationToken = default)
+        public virtual ClientResult<ListModelsResponse> GetModels()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = GetModels(options);
+            ClientResult result = GetModels(null);
             return ClientResult.FromValue(ListModelsResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -75,7 +70,7 @@ public virtual ClientResult<ListModelsResponse> GetModels(CancellationToken canc
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetModelsAsync(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetModelsAsync()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -100,7 +95,7 @@ public virtual async Task<ClientResult> GetModelsAsync(RequestOptions options)
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="GetModels(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="GetModels()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -119,15 +114,13 @@ public virtual ClientResult GetModels(RequestOptions options)
         /// permissioning.
         /// </summary>
         /// <param name="model"> The ID of the model to use for this request. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="model"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="model"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<Model>> RetrieveAsync(string model, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Model>> RetrieveAsync(string model)
         {
             Argument.AssertNotNullOrEmpty(model, nameof(model));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await RetrieveAsync(model, options).ConfigureAwait(false);
+            ClientResult result = await RetrieveAsync(model, null).ConfigureAwait(false);
             return ClientResult.FromValue(Model.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -136,15 +129,13 @@ public virtual async Task<ClientResult<Model>> RetrieveAsync(string model, Cance
         /// permissioning.
         /// </summary>
         /// <param name="model"> The ID of the model to use for this request. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="model"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="model"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<Model> Retrieve(string model, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Model> Retrieve(string model)
         {
             Argument.AssertNotNullOrEmpty(model, nameof(model));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Retrieve(model, options);
+            ClientResult result = Retrieve(model, null);
             return ClientResult.FromValue(Model.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -159,7 +150,7 @@ public virtual ClientResult<Model> Retrieve(string model, CancellationToken canc
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="RetrieveAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="RetrieveAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -189,7 +180,7 @@ public virtual async Task<ClientResult> RetrieveAsync(string model, RequestOptio
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Retrieve(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Retrieve(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -210,29 +201,25 @@ public virtual ClientResult Retrieve(string model, RequestOptions options)
 
         /// <summary> Delete a fine-tuned model. You must have the Owner role in your organization to delete a model. </summary>
         /// <param name="model"> The model to delete. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="model"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="model"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<DeleteModelResponse>> DeleteAsync(string model, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<DeleteModelResponse>> DeleteAsync(string model)
         {
             Argument.AssertNotNullOrEmpty(model, nameof(model));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await DeleteAsync(model, options).ConfigureAwait(false);
+            ClientResult result = await DeleteAsync(model, null).ConfigureAwait(false);
             return ClientResult.FromValue(DeleteModelResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Delete a fine-tuned model. You must have the Owner role in your organization to delete a model. </summary>
         /// <param name="model"> The model to delete. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="model"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="model"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<DeleteModelResponse> Delete(string model, CancellationToken cancellationToken = default)
+        public virtual ClientResult<DeleteModelResponse> Delete(string model)
         {
             Argument.AssertNotNullOrEmpty(model, nameof(model));
 
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Delete(model, options);
+            ClientResult result = Delete(model, null);
             return ClientResult.FromValue(DeleteModelResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -246,7 +233,7 @@ public virtual ClientResult<DeleteModelResponse> Delete(string model, Cancellati
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="DeleteAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="DeleteAsync(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -275,7 +262,7 @@ public virtual async Task<ClientResult> DeleteAsync(string model, RequestOptions
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Delete(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Delete(string)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -350,17 +337,6 @@ internal PipelineMessage CreateDeleteRequest(string model, RequestOptions option
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Moderations.cs b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Moderations.cs
index e7a2adb7741..09cc1e0918e 100644
--- a/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Moderations.cs
+++ b/test/UnbrandedProjects/Platform-OpenAI-TypeSpec/src/Generated/Moderations.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenAI.Models;
 
@@ -42,29 +41,25 @@ internal Moderations(ClientPipeline pipeline, ApiKeyCredential keyCredential, Ur
 
         /// <summary> Classifies if text violates OpenAI's Content Policy. </summary>
         /// <param name="content"> The <see cref="CreateModerationRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        public virtual async Task<ClientResult<CreateModerationResponse>> CreateAsync(CreateModerationRequest content, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<CreateModerationResponse>> CreateAsync(CreateModerationRequest content)
         {
             Argument.AssertNotNull(content, nameof(content));
 
             using BinaryContent content0 = content.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateAsync(content0, options).ConfigureAwait(false);
+            ClientResult result = await CreateAsync(content0, null).ConfigureAwait(false);
             return ClientResult.FromValue(CreateModerationResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Classifies if text violates OpenAI's Content Policy. </summary>
         /// <param name="content"> The <see cref="CreateModerationRequest"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        public virtual ClientResult<CreateModerationResponse> Create(CreateModerationRequest content, CancellationToken cancellationToken = default)
+        public virtual ClientResult<CreateModerationResponse> Create(CreateModerationRequest content)
         {
             Argument.AssertNotNull(content, nameof(content));
 
             using BinaryContent content0 = content.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = Create(content0, options);
+            ClientResult result = Create(content0, null);
             return ClientResult.FromValue(CreateModerationResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -78,7 +73,7 @@ public virtual ClientResult<CreateModerationResponse> Create(CreateModerationReq
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateAsync(CreateModerationRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateAsync(CreateModerationRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -106,7 +101,7 @@ public virtual async Task<ClientResult> CreateAsync(BinaryContent content, Reque
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="Create(CreateModerationRequest,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="Create(CreateModerationRequest)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -144,17 +139,6 @@ internal PipelineMessage CreateCreateRequest(BinaryContent content, RequestOptio
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
     }
diff --git a/test/UnbrandedProjects/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecClient.cs b/test/UnbrandedProjects/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecClient.cs
index d4836c2c78d..b969885fd53 100644
--- a/test/UnbrandedProjects/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecClient.cs
+++ b/test/UnbrandedProjects/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecClient.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
-using System.Threading;
 using System.Threading.Tasks;
 using UnbrandedTypeSpec.Models;
 
@@ -108,18 +107,16 @@ public virtual ClientResult SayHi(string headParameter, string queryParameter, s
         /// <param name="p2"> The <see cref="string"/> to use. </param>
         /// <param name="p1"> The <see cref="string"/> to use. </param>
         /// <param name="action"> The <see cref="RoundTripModel"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="action"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="p2"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<ClientResult<RoundTripModel>> HelloAgainAsync(string p2, string p1, RoundTripModel action, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<RoundTripModel>> HelloAgainAsync(string p2, string p1, RoundTripModel action)
         {
             Argument.AssertNotNullOrEmpty(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(action, nameof(action));
 
             using BinaryContent content = action.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await HelloAgainAsync(p2, p1, content, options).ConfigureAwait(false);
+            ClientResult result = await HelloAgainAsync(p2, p1, content, null).ConfigureAwait(false);
             return ClientResult.FromValue(RoundTripModel.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -127,18 +124,16 @@ public virtual async Task<ClientResult<RoundTripModel>> HelloAgainAsync(string p
         /// <param name="p2"> The <see cref="string"/> to use. </param>
         /// <param name="p1"> The <see cref="string"/> to use. </param>
         /// <param name="action"> The <see cref="RoundTripModel"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="action"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="p2"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual ClientResult<RoundTripModel> HelloAgain(string p2, string p1, RoundTripModel action, CancellationToken cancellationToken = default)
+        public virtual ClientResult<RoundTripModel> HelloAgain(string p2, string p1, RoundTripModel action)
         {
             Argument.AssertNotNullOrEmpty(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(action, nameof(action));
 
             using BinaryContent content = action.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = HelloAgain(p2, p1, content, options);
+            ClientResult result = HelloAgain(p2, p1, content, null);
             return ClientResult.FromValue(RoundTripModel.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -152,7 +147,7 @@ public virtual ClientResult<RoundTripModel> HelloAgain(string p2, string p1, Rou
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloAgainAsync(string,string,RoundTripModel,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloAgainAsync(string,string,RoundTripModel)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -185,7 +180,7 @@ public virtual async Task<ClientResult> HelloAgainAsync(string p2, string p1, Bi
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloAgain(string,string,RoundTripModel,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloAgain(string,string,RoundTripModel)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -265,20 +260,16 @@ public virtual ClientResult NoContentType(string p2, string p1, BinaryContent co
         }
 
         /// <summary> Return hi in demo2. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<Thing>> HelloDemo2Async(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> HelloDemo2Async()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await HelloDemo2Async(options).ConfigureAwait(false);
+            ClientResult result = await HelloDemo2Async(null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Return hi in demo2. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<Thing> HelloDemo2(CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> HelloDemo2()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = HelloDemo2(options);
+            ClientResult result = HelloDemo2(null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -292,7 +283,7 @@ public virtual ClientResult<Thing> HelloDemo2(CancellationToken cancellationToke
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloDemo2Async(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloDemo2Async()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -316,7 +307,7 @@ public virtual async Task<ClientResult> HelloDemo2Async(RequestOptions options)
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloDemo2(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloDemo2()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -332,29 +323,25 @@ public virtual ClientResult HelloDemo2(RequestOptions options)
 
         /// <summary> Create with literal value. </summary>
         /// <param name="body"> The <see cref="Thing"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual async Task<ClientResult<Thing>> CreateLiteralAsync(Thing body, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> CreateLiteralAsync(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await CreateLiteralAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await CreateLiteralAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Create with literal value. </summary>
         /// <param name="body"> The <see cref="Thing"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual ClientResult<Thing> CreateLiteral(Thing body, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> CreateLiteral(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = CreateLiteral(content, options);
+            ClientResult result = CreateLiteral(content, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -368,7 +355,7 @@ public virtual ClientResult<Thing> CreateLiteral(Thing body, CancellationToken c
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateLiteralAsync(Thing,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateLiteralAsync(Thing)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -396,7 +383,7 @@ public virtual async Task<ClientResult> CreateLiteralAsync(BinaryContent content
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="CreateLiteral(Thing,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="CreateLiteral(Thing)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -415,20 +402,16 @@ public virtual ClientResult CreateLiteral(BinaryContent content, RequestOptions
         }
 
         /// <summary> Send literal parameters. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<Thing>> HelloLiteralAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> HelloLiteralAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await HelloLiteralAsync(options).ConfigureAwait(false);
+            ClientResult result = await HelloLiteralAsync(null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Send literal parameters. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<Thing> HelloLiteral(CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> HelloLiteral()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = HelloLiteral(options);
+            ClientResult result = HelloLiteral(null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -442,7 +425,7 @@ public virtual ClientResult<Thing> HelloLiteral(CancellationToken cancellationTo
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloLiteralAsync(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloLiteralAsync()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -466,7 +449,7 @@ public virtual async Task<ClientResult> HelloLiteralAsync(RequestOptions options
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="HelloLiteral(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="HelloLiteral()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -482,21 +465,17 @@ public virtual ClientResult HelloLiteral(RequestOptions options)
 
         /// <summary> top level method. </summary>
         /// <param name="action"> The <see cref="DateTimeOffset"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<Thing>> TopActionAsync(DateTimeOffset action, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> TopActionAsync(DateTimeOffset action)
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await TopActionAsync(action, options).ConfigureAwait(false);
+            ClientResult result = await TopActionAsync(action, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> top level method. </summary>
         /// <param name="action"> The <see cref="DateTimeOffset"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<Thing> TopAction(DateTimeOffset action, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> TopAction(DateTimeOffset action)
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = TopAction(action, options);
+            ClientResult result = TopAction(action, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -510,7 +489,7 @@ public virtual ClientResult<Thing> TopAction(DateTimeOffset action, Cancellation
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="TopActionAsync(DateTimeOffset,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="TopActionAsync(DateTimeOffset)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -535,7 +514,7 @@ public virtual async Task<ClientResult> TopActionAsync(DateTimeOffset action, Re
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="TopAction(DateTimeOffset,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="TopAction(DateTimeOffset)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -636,29 +615,25 @@ public virtual ClientResult PatchAction(BinaryContent content, RequestOptions op
 
         /// <summary> body parameter without body decorator. </summary>
         /// <param name="thing"> A model with a few properties of literal types. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="thing"/> is null. </exception>
-        public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(Thing thing, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(Thing thing)
         {
             Argument.AssertNotNull(thing, nameof(thing));
 
             using BinaryContent content = thing.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await AnonymousBodyAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await AnonymousBodyAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> body parameter without body decorator. </summary>
         /// <param name="thing"> A model with a few properties of literal types. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="thing"/> is null. </exception>
-        public virtual ClientResult<Thing> AnonymousBody(Thing thing, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> AnonymousBody(Thing thing)
         {
             Argument.AssertNotNull(thing, nameof(thing));
 
             using BinaryContent content = thing.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = AnonymousBody(content, options);
+            ClientResult result = AnonymousBody(content, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -672,7 +647,7 @@ public virtual ClientResult<Thing> AnonymousBody(Thing thing, CancellationToken
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="AnonymousBodyAsync(Thing,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="AnonymousBodyAsync(Thing)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -700,7 +675,7 @@ public virtual async Task<ClientResult> AnonymousBodyAsync(BinaryContent content
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="AnonymousBody(Thing,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="AnonymousBody(Thing)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -720,29 +695,25 @@ public virtual ClientResult AnonymousBody(BinaryContent content, RequestOptions
 
         /// <summary> Model can have its friendly name. </summary>
         /// <param name="friend"> this is not a friendly model but with a friendly name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="friend"/> is null. </exception>
-        public virtual async Task<ClientResult<Friend>> FriendlyModelAsync(Friend friend, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Friend>> FriendlyModelAsync(Friend friend)
         {
             Argument.AssertNotNull(friend, nameof(friend));
 
             using BinaryContent content = friend.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await FriendlyModelAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await FriendlyModelAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(Friend.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Model can have its friendly name. </summary>
         /// <param name="friend"> this is not a friendly model but with a friendly name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="friend"/> is null. </exception>
-        public virtual ClientResult<Friend> FriendlyModel(Friend friend, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Friend> FriendlyModel(Friend friend)
         {
             Argument.AssertNotNull(friend, nameof(friend));
 
             using BinaryContent content = friend.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = FriendlyModel(content, options);
+            ClientResult result = FriendlyModel(content, null);
             return ClientResult.FromValue(Friend.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -756,7 +727,7 @@ public virtual ClientResult<Friend> FriendlyModel(Friend friend, CancellationTok
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="FriendlyModelAsync(Friend,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="FriendlyModelAsync(Friend)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -784,7 +755,7 @@ public virtual async Task<ClientResult> FriendlyModelAsync(BinaryContent content
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="FriendlyModel(Friend,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="FriendlyModel(Friend)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -843,30 +814,26 @@ public virtual ClientResult AddTimeHeader(RequestOptions options = null)
         /// <summary> parameter has string format. </summary>
         /// <param name="subscriptionId"> The <see cref="Guid"/> to use. </param>
         /// <param name="body"> The <see cref="ModelWithFormat"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual async Task<ClientResult> StringFormatAsync(Guid subscriptionId, ModelWithFormat body, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult> StringFormatAsync(Guid subscriptionId, ModelWithFormat body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await StringFormatAsync(subscriptionId, content, options).ConfigureAwait(false);
+            ClientResult result = await StringFormatAsync(subscriptionId, content, null).ConfigureAwait(false);
             return result;
         }
 
         /// <summary> parameter has string format. </summary>
         /// <param name="subscriptionId"> The <see cref="Guid"/> to use. </param>
         /// <param name="body"> The <see cref="ModelWithFormat"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual ClientResult StringFormat(Guid subscriptionId, ModelWithFormat body, CancellationToken cancellationToken = default)
+        public virtual ClientResult StringFormat(Guid subscriptionId, ModelWithFormat body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = StringFormat(subscriptionId, content, options);
+            ClientResult result = StringFormat(subscriptionId, content, null);
             return result;
         }
 
@@ -880,7 +847,7 @@ public virtual ClientResult StringFormat(Guid subscriptionId, ModelWithFormat bo
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="StringFormatAsync(Guid,ModelWithFormat,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="StringFormatAsync(Guid,ModelWithFormat)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -909,7 +876,7 @@ public virtual async Task<ClientResult> StringFormatAsync(Guid subscriptionId, B
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="StringFormat(Guid,ModelWithFormat,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="StringFormat(Guid,ModelWithFormat)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -930,29 +897,25 @@ public virtual ClientResult StringFormat(Guid subscriptionId, BinaryContent cont
 
         /// <summary> Model can have its projected name. </summary>
         /// <param name="projectedModel"> this is a model with a projected name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="projectedModel"/> is null. </exception>
-        public virtual async Task<ClientResult<ProjectedModel>> ProjectedNameModelAsync(ProjectedModel projectedModel, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ProjectedModel>> ProjectedNameModelAsync(ProjectedModel projectedModel)
         {
             Argument.AssertNotNull(projectedModel, nameof(projectedModel));
 
             using BinaryContent content = projectedModel.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await ProjectedNameModelAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await ProjectedNameModelAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(ProjectedModel.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> Model can have its projected name. </summary>
         /// <param name="projectedModel"> this is a model with a projected name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="projectedModel"/> is null. </exception>
-        public virtual ClientResult<ProjectedModel> ProjectedNameModel(ProjectedModel projectedModel, CancellationToken cancellationToken = default)
+        public virtual ClientResult<ProjectedModel> ProjectedNameModel(ProjectedModel projectedModel)
         {
             Argument.AssertNotNull(projectedModel, nameof(projectedModel));
 
             using BinaryContent content = projectedModel.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = ProjectedNameModel(content, options);
+            ClientResult result = ProjectedNameModel(content, null);
             return ClientResult.FromValue(ProjectedModel.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -966,7 +929,7 @@ public virtual ClientResult<ProjectedModel> ProjectedNameModel(ProjectedModel pr
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="ProjectedNameModelAsync(ProjectedModel,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="ProjectedNameModelAsync(ProjectedModel)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -994,7 +957,7 @@ public virtual async Task<ClientResult> ProjectedNameModelAsync(BinaryContent co
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="ProjectedNameModel(ProjectedModel,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="ProjectedNameModel(ProjectedModel)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -1013,20 +976,16 @@ public virtual ClientResult ProjectedNameModel(BinaryContent content, RequestOpt
         }
 
         /// <summary> return anonymous model. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult<ReturnsAnonymousModelResponse>> ReturnsAnonymousModelAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<ReturnsAnonymousModelResponse>> ReturnsAnonymousModelAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await ReturnsAnonymousModelAsync(options).ConfigureAwait(false);
+            ClientResult result = await ReturnsAnonymousModelAsync(null).ConfigureAwait(false);
             return ClientResult.FromValue(ReturnsAnonymousModelResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> return anonymous model. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel(CancellationToken cancellationToken = default)
+        public virtual ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = ReturnsAnonymousModel(options);
+            ClientResult result = ReturnsAnonymousModel(null);
             return ClientResult.FromValue(ReturnsAnonymousModelResponse.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -1040,7 +999,7 @@ public virtual ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="ReturnsAnonymousModelAsync(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="ReturnsAnonymousModelAsync()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -1064,7 +1023,7 @@ public virtual async Task<ClientResult> ReturnsAnonymousModelAsync(RequestOption
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="ReturnsAnonymousModel(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="ReturnsAnonymousModel()"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
@@ -1126,29 +1085,25 @@ public virtual ClientResult CreateUnknownValue(BinaryContent content, RequestOpt
 
         /// <summary> When set protocol false and convenient true, then the protocol method should be internal. </summary>
         /// <param name="body"> The <see cref="Thing"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual async Task<ClientResult<Thing>> InternalProtocolAsync(Thing body, CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult<Thing>> InternalProtocolAsync(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await InternalProtocolAsync(content, options).ConfigureAwait(false);
+            ClientResult result = await InternalProtocolAsync(content, null).ConfigureAwait(false);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
         /// <summary> When set protocol false and convenient true, then the protocol method should be internal. </summary>
         /// <param name="body"> The <see cref="Thing"/> to use. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual ClientResult<Thing> InternalProtocol(Thing body, CancellationToken cancellationToken = default)
+        public virtual ClientResult<Thing> InternalProtocol(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
             using BinaryContent content = body.ToBinaryContent();
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = InternalProtocol(content, options);
+            ClientResult result = InternalProtocol(content, null);
             return ClientResult.FromValue(Thing.FromResponse(result.GetRawResponse()), result.GetRawResponse());
         }
 
@@ -1199,20 +1154,16 @@ internal virtual ClientResult InternalProtocol(BinaryContent content, RequestOpt
         }
 
         /// <summary> When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<ClientResult> StillConvenientValueAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ClientResult> StillConvenientValueAsync()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = await StillConvenientAsync(options).ConfigureAwait(false);
+            ClientResult result = await StillConvenientAsync(null).ConfigureAwait(false);
             return result;
         }
 
         /// <summary> When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one. </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual ClientResult StillConvenientValue(CancellationToken cancellationToken = default)
+        public virtual ClientResult StillConvenientValue()
         {
-            RequestOptions options = FromCancellationToken(cancellationToken);
-            ClientResult result = StillConvenient(options);
+            ClientResult result = StillConvenient(null);
             return result;
         }
 
@@ -1685,17 +1636,6 @@ internal PipelineMessage CreateHeadAsBooleanRequest(string id, RequestOptions op
             return message;
         }
 
-        private static RequestOptions DefaultRequestContext = new RequestOptions();
-        internal static RequestOptions FromCancellationToken(CancellationToken cancellationToken = default)
-        {
-            if (!cancellationToken.CanBeCanceled)
-            {
-                return DefaultRequestContext;
-            }
-
-            return new RequestOptions() { CancellationToken = cancellationToken };
-        }
-
         private static PipelineMessageClassifier _pipelineMessageClassifier200;
         private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
         private static PipelineMessageClassifier _pipelineMessageClassifier204;