diff --git a/infra/main.bicep b/infra/main.bicep
index 82cd40d..d80d42e 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -12,14 +12,14 @@ param location string
 param mcpTodoServerAppExists bool
 param mcpTodoClientAppExists bool
 
-@description('Id of the user or app to assign application roles')
-param principalId string
+//@description('Id of the user or app to assign application roles')
+//param principalId string
 
 @description('Whether to use the built-in login feature for the application or not')
 param useLogin bool = true
 
-@description('Whether to use API Management or not')
-param useApiManagement bool = false
+//@description('Whether to use API Management or not')
+//param useApiManagement bool = false
 
 @description('The connection string to OpenAI.')
 @secure()
@@ -48,11 +48,11 @@ module resources 'resources.bicep' = {
     environmentName: environmentName
     location: location
     tags: tags
-    principalId: principalId
+    //principalId: principalId
     mcpTodoServerAppExists: mcpTodoServerAppExists
     mcpTodoClientAppExists: mcpTodoClientAppExists
     useLogin: useLogin
-    useApiManagement: useApiManagement
+    //useApiManagement: useApiManagement
     openAIConnectionString: openAIConnectionString
   }
 }
diff --git a/infra/resources.bicep b/infra/resources.bicep
index 1ebd717..896d080 100644
--- a/infra/resources.bicep
+++ b/infra/resources.bicep
@@ -10,14 +10,14 @@ param tags object = {}
 param mcpTodoClientAppExists bool
 param mcpTodoServerAppExists bool
 
-@description('Id of the user or app to assign application roles')
-param principalId string
+//@description('Id of the user or app to assign application roles')
+//param principalId string
 
 @description('Whether to use the built-in login feature for the application or not')
 param useLogin bool = true
 
-@description('Whether to use API Management or not')
-param useApiManagement bool = false
+//@description('Whether to use API Management or not')
+//param useApiManagement bool = false
 
 @description('The connection string to OpenAI.')
 @secure()
@@ -58,6 +58,7 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.15.0' = if (u
   }
 }
 
+/*
 // API Management
 module apiManagement 'br/public:avm/res/api-management/service:0.9.1' = if (useApiManagement == true) {
   name: 'apimanagement'
@@ -116,6 +117,7 @@ module apimApi './modules/apim-api.bicep' = if (useApiManagement == true) {
     apimProduct
   ]
 }
+*/
 
 // Container registry
 module containerRegistry 'br/public:avm/res/container-registry/registry:0.6.0' = {
@@ -298,7 +300,8 @@ module mcpTodoClientApp 'br/public:avm/res/app/container-app:0.16.0' = {
           }
           {
             name: 'McpServers__TodoList'
-            value: useApiManagement ? 'https://${apiManagement.outputs.name}.azure-api.net' : 'https://${mcpTodoServerApp.outputs.fqdn}'
+            value: 'https://${mcpTodoServerApp.outputs.fqdn}'
+            //value: useApiManagement ? 'https://${apiManagement.outputs.name}.azure-api.net' : 'https://${mcpTodoServerApp.outputs.fqdn}'
           }
           {
             name: 'ConnectionStrings__OpenAI'