diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
index afb76a967..3384e3b7d 100644
--- a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -67,17 +67,6 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
                     responseMessage.FunctionName = responseMessage.FunctionName.Split('.').Last();
                 }
             }
-            //else if (reason == ChatFinishReason.ToolCalls)
-            //{
-            //    var toolCall = value.ToolCalls.FirstOrDefault();
-            //    responseMessage = new RoleDialogModel(AgentRole.Function, text)
-            //    {
-            //        CurrentAgentId = agent.Id,
-            //        MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
-            //        FunctionName = toolCall?.FunctionName,
-            //        FunctionArgs = toolCall?.FunctionArguments
-            //    };
-            //}
             else
             {
                 responseMessage = new RoleDialogModel(AgentRole.Assistant, text)
@@ -281,13 +270,6 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD
         {
             if (message.Role == AgentRole.Function)
             {
-                //messages.Add(new AssistantChatMessage(string.Empty)
-                //{
-                //    FunctionCall = new ChatFunctionCall(message.FunctionName, message.FunctionArgs ?? string.Empty)
-                //});
-
-                //messages.Add(new FunctionChatMessage(message.FunctionName, message.Content));
-
                 messages.Add(new AssistantChatMessage(new List<ChatToolCall>
                 {
                     ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))