diff --git a/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs b/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs
index 84039cfb..bac79cd4 100644
--- a/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs
+++ b/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs
@@ -55,13 +55,13 @@ public class MCPToolAgentHook : AgentHookBase
             var mcpClient =  await mcpClientManager.GetMcpClientAsync(item.ServerId);
             if (mcpClient != null)
             {
-                var tools = await mcpClient.ListToolsAsync().ToListAsync();
+                /*var tools = await mcpClient.ListToolsAsync().ToListAsync();
                 var toolnames = item.Functions.Select(x => x.Name).ToList();
                 foreach (var tool in tools.Where(x => toolnames.Contains(x.Name, StringComparer.OrdinalIgnoreCase)))
                 {
                     var funDef = AIFunctionUtilities.MapToFunctionDef(tool);
                     functionDefs.Add(funDef);
-                }
+                }*/
             }
         }
 
diff --git a/src/Infrastructure/BotSharp.MCP/McpPlugin.cs b/src/Infrastructure/BotSharp.MCP/McpPlugin.cs
index f95965ac..f85dc951 100644
--- a/src/Infrastructure/BotSharp.MCP/McpPlugin.cs
+++ b/src/Infrastructure/BotSharp.MCP/McpPlugin.cs
@@ -45,7 +45,7 @@ public class McpPlugin : IBotSharpPlugin
     private async Task RegisterFunctionCall(IServiceCollection services, McpServerConfig server)
     {
         var client = await clientManager.GetMcpClientAsync(server.Id);
-        var tools = await client.ListToolsAsync().ToListAsync(); 
+        /*var tools = await client.ListToolsAsync().ToListAsync(); 
 
         foreach (var tool in tools)
         {
@@ -56,6 +56,6 @@ public class McpPlugin : IBotSharpPlugin
                 var funcTool = new McpToolAdapter(provider, tool, clientManager);
                 return funcTool;
             });
-        }
+        }*/
     }
 }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
index 6e49658d..61530b15 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -178,10 +178,11 @@ public class AgentController : ControllerBase
     public async Task<IEnumerable<Tool>> GetMCPTools(string serverId)
     {
         var client = await _clientManager.GetMcpClientAsync(serverId);
-        var tools = await client.ListToolsAsync().ToListAsync();
+        throw new NotImplementedException();
+        /*var tools = await client.ListToolsAsync().ToListAsync();
          
         return tools.Where(x => !string.IsNullOrWhiteSpace(x.Name))
-            .OrderBy(x => x.Name).ToList();
+            .OrderBy(x => x.Name).ToList();*/
     }
 
     [HttpGet("/agent/labels")]