Fix merge conflicts

Set shards to 12 and workers to 3
Fix pipeline errors
2025-12-23 02:41:39 +00:00 · 2025-04-30 09:11:57 -05:00 · 2025-04-30 09:11:19 -05:00 · 2025-04-30 09:10:50 -05:00 · 2025-04-30 09:10:47 -05:00 · 2025-04-30 09:09:37 -05:00
108 changed files with 1249 additions and 6693 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -24,8 +24,5 @@
    "source.organizeImports": "explicit"
  },
  "typescript.preferences.importModuleSpecifier": "non-relative",
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  }
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }
--- a/images/VisualStudio.svg
+++ b/images/VisualStudio.svg
--- a/images/vscode.svg
+++ b/images/vscode.svg
@@ -1 +0,0 @@
-<svg width="15" height="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><defs><clipPath id="clip0"><rect x="479" y="279" width="15" height="15"/></clipPath><clipPath id="clip1"><rect x="-0.287396" y="-0.171573" width="152381" height="152381"/></clipPath><image width="35" height="35" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAH4UExURQAAAASExCGs7CC//wB9vQB5uxSU1yaz8ySy9AB8uwB8vAB5uxOR1Say8yax8iaw8gB6vAB6uwB7uwB4uROQ1Cax8ySy8QCAvwB3ugB5ugB2uROP1CWw8yav8wCT2QCQ1QCP1wB2uQB1uBOO0yWv8yat8wCP1QCP1QCP1QCO1QCQ1wB1tQB2uAB3uAB1tx+k6SSt8ySt8QCN0wCO1ACM0wBzuQBztAB1twB0tgB0tiSr8SSs8gCM1ACM1ACEywBwtQBxtAB0tgBztQB0sySp8SSr8gCL0wCK0gCL0wCHzwByuABusgBztQBttiOq8gB6wQCI0QCJ0gB7wySn8SOo8gBxtABtsABwtgCFzwCI0gCG0QCJ0SKn8SKn8iKl8QBvsABvsgBvsQBtsABssgCCzACG0QCF0ACDzyKm8QBtrwBusABsrgCAzQCE0ACF0ACF0ACE0CKj8SKl8QBssQBtrwBtrwBsrgBsrwCK1QCBzwCD0ACA0B2d7CGj8QBsrABrrQBwrwCA3wCC0ACCzwCBzwB+zhGM3iGi8SKh8QCAzQCAzgCAzwB9zRCK3iCh8SGh8SCf8QB+zAB/zgB8zRCJ3SCg8SCf7wB+zQB6zBCI3CCe8CCf8CCe8CCf8SCf/wB7zAB4yxGJ3h6c8CCd7yCf7wmA0RqX60C//5CaUeMAAACodFJOUwA8XAho+//ncID/////53iM//////9wCKv/////gCiYILf///+AMPP/70wYw/+3lP+AXP+MKNv/+3uA/3z/+////+NAgP9c9/////+7HP+A///MgP9Y+////7scgP+AeP/////7/+NA/2D/iyTb//t4gP808//vUBjD/7eU/yifIAi3//////+Ar////////4CI/////3B//////+9/CGj7/+dwEDhYBCm1XqwAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAFpSURBVDhPY2AYBaiAkYkZXQgdsLCysXPgV8XJxc3Dy8vHj0eVgKCQsIioqKioGLoMDIhLSEpKSknLyMjIyKLLyckrgJUoCgsLCyspq6ioqKiiKVFT19DUYmDQ1tEFAT19AwMDA0M0NUbGxsbGJqZm5ubm5haWDFbW1tbWVmhqGGxsbW1t7ewdHB2dnBkYXFxdXV1d0NUwuLl7eHh4enn7+DIwMLj4+fn5Yaph8A8IDAwMDBIHsYNDQkJCgtFVMISGhUdERkZGRkUzMDDExMbGxsahK4lPSExKTklNTU1NS2dgiMvIyMhAV5OZlZWVlZ2Tm5eXl5dfwFBYVFRUVIimpriktKycgaGisgoEqmtqa2tr0dUw1NU3gKjGpuaWlpbWtvb29vYOdDUw0NjZ1dXd09vX39c3AV0OASZOmjR5ytSpU6dOQ5dBAtN7ZsycNXvO3HnoEshg/oKFixYvQRdFA0uXLUcXGqEAAH4FV0z+qQbjAAAAAElFTkSuQmCC" preserveAspectRatio="none" id="img2"></image><clipPath id="clip3"><path d="M44291.4 46947.4 187148 46947.4 187148 188823 44291.4 188823Z" fill-rule="evenodd" clip-rule="evenodd"/></clipPath></defs><g clip-path="url(#clip0)" transform="translate(-479 -279)"><g clip-path="url(#clip1)" transform="matrix(0.000105 0 0 0.000105 479 279)"><g clip-path="url(#clip3)" transform="matrix(1 0 0 1.00692 -44291.4 -47272.4)"><use width="100%" height="100%" xlink:href="#img2" transform="scale(6709.45 6709.45)"></use></g></g></g></svg>
--- a/less/documentDB.less
+++ b/less/documentDB.less
@@ -2869,7 +2869,6 @@ a:link {
  z-index: 1000;
  overflow-y: auto;
  overflow-x: clip;
-  min-height: fit-content;
 }

 .uniqueIndexesContainer {
--- a/less/documentDBFabric.less
+++ b/less/documentDBFabric.less
@@ -211,12 +211,3 @@ a:focus {
 .fileImportImg img {
  filter: brightness(0) saturate(100%);
 }
-
-.tabPanesContainer {
-  overflow: auto !important;
-}
-
-.tabs-container {
-  min-height: 500px;
-  min-width: 500px;
-}
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
      "hasInstallScript": true,
      "dependencies": {
        "@azure/arm-cosmosdb": "9.1.0",
-        "@azure/cosmos": "4.3.0",
+        "@azure/cosmos": "4.2.0-beta.1",
        "@azure/cosmos-language-service": "0.0.5",
        "@azure/identity": "4.5.0",
        "@azure/msal-browser": "2.14.2",
@@ -51,8 +51,6 @@
        "@types/mkdirp": "1.0.1",
        "@types/node-fetch": "2.5.7",
        "@xmldom/xmldom": "0.7.13",
-        "@xterm/addon-fit": "0.10.0",
-        "@xterm/xterm": "5.5.0",
        "allotment": "1.20.2",
        "applicationinsights": "1.8.0",
        "bootstrap": "3.4.1",
@@ -290,71 +288,59 @@
      "version": "2.6.2",
      "license": "0BSD"
    },
-    "node_modules/@azure/core-http-compat": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.0.tgz",
-      "integrity": "sha512-qLQujmUypBBG0gxHd0j6/Jdmul6ttl24c8WGiLXIk7IHXdBlfoBqW27hyz3Xn6xbfdyVSarl1Ttbk0AwnZBYCw==",
-      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-client": "^1.3.0",
-        "@azure/core-rest-pipeline": "^1.20.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/core-lro": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.7.2.tgz",
-      "integrity": "sha512-0YIpccoX8m/k00O7mDDMdJpbr6mf1yWo2dfmxt5A8XVZVVMz2SSKaEbMCeJRvgQ0IaSlqhjT47p4hVIRRy90xw==",
-      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-util": "^1.2.0",
-        "@azure/logger": "^1.0.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/core-lro/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
-    "node_modules/@azure/core-paging": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.6.2.tgz",
-      "integrity": "sha512-YKWi9YuCU04B55h25cnOYZHxXYtEvQEbKST5vqRga7hWY9ydd3FZHdeQF8pyh+acWZvppw13M/LMGx0LABUVMA==",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/core-paging/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
    "node_modules/@azure/core-rest-pipeline": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.20.0.tgz",
-      "integrity": "sha512-ASoP8uqZBS3H/8N8at/XwFr6vYrRP3syTK0EUjDXQy0Y1/AUS+QeIRThKmTNJO2RggvBBxaXDPM7YoIwDGeA0g==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.18.0.tgz",
+      "integrity": "sha512-QSoGUp4Eq/gohEFNJaUOwTN7BCc2nHTjjbm75JT0aD7W65PWM1H/tItz0GsABn22uaKyGxiMhWQLt2r+FGU89Q==",
      "dependencies": {
        "@azure/abort-controller": "^2.0.0",
        "@azure/core-auth": "^1.8.0",
        "@azure/core-tracing": "^1.0.1",
        "@azure/core-util": "^1.11.0",
        "@azure/logger": "^1.0.0",
-        "@typespec/ts-http-runtime": "^0.2.2",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
        "tslib": "^2.6.2"
      },
      "engines": {
        "node": ">=18.0.0"
      }
    },
+    "node_modules/@azure/core-rest-pipeline/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "node_modules/@azure/core-rest-pipeline/node_modules/tslib": {
      "version": "2.6.2",
      "license": "0BSD"
@@ -391,16 +377,15 @@
      "license": "0BSD"
    },
    "node_modules/@azure/cosmos": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.3.0.tgz",
-      "integrity": "sha512-0Ls3l1uWBBSphx6YRhnM+w7rSvq8qVugBCdO6kSiNuRYXEf6+YWLjbzz4e7L2kkz/6ScFdZIOJYP+XtkiRYOhA==",
+      "version": "4.2.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.2.0-beta.1.tgz",
+      "integrity": "sha512-mREONehm1DxjEKXGaNU6Wmpf9Ckb9IrhKFXhDFVs45pxmoEb3y2s/Ub0owuFmqlphpcS1zgtYQn5exn+lwnJuQ==",
      "dependencies": {
        "@azure/abort-controller": "^2.0.0",
        "@azure/core-auth": "^1.7.1",
        "@azure/core-rest-pipeline": "^1.15.1",
        "@azure/core-tracing": "^1.1.1",
        "@azure/core-util": "^1.8.1",
-        "@azure/keyvault-keys": "^4.8.0",
        "fast-json-stable-stringify": "^2.1.0",
        "jsbi": "^4.3.0",
        "priorityqueuejs": "^2.0.0",
@@ -505,66 +490,14 @@
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
    },
-    "node_modules/@azure/keyvault-common": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@azure/keyvault-common/-/keyvault-common-2.0.0.tgz",
-      "integrity": "sha512-wRLVaroQtOqfg60cxkzUkGKrKMsCP6uYXAOomOIysSMyt1/YM0eUn9LqieAWM8DLcU4+07Fio2YGpPeqUbpP9w==",
-      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.3.0",
-        "@azure/core-client": "^1.5.0",
-        "@azure/core-rest-pipeline": "^1.8.0",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.10.0",
-        "@azure/logger": "^1.1.4",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/keyvault-common/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
-    "node_modules/@azure/keyvault-keys": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.9.0.tgz",
-      "integrity": "sha512-ZBP07+K4Pj3kS4TF4XdkqFcspWwBHry3vJSOFM5k5ZABvf7JfiMonvaFk2nBF6xjlEbMpz5PE1g45iTMme0raQ==",
-      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.3.0",
-        "@azure/core-client": "^1.5.0",
-        "@azure/core-http-compat": "^2.0.1",
-        "@azure/core-lro": "^2.2.0",
-        "@azure/core-paging": "^1.1.1",
-        "@azure/core-rest-pipeline": "^1.8.1",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.0.0",
-        "@azure/keyvault-common": "^2.0.0",
-        "@azure/logger": "^1.0.0",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/keyvault-keys/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
    "node_modules/@azure/logger": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.2.0.tgz",
-      "integrity": "sha512-0hKEzLhpw+ZTAfNJyRrn6s+V0nDWzXk9OjBr2TiGIu0OfMr5s2V4FpKLTAK3Ca5r5OKLbf4hkOGDPyiRjie/jA==",
+      "version": "1.0.4",
+      "license": "MIT",
      "dependencies": {
-        "@typespec/ts-http-runtime": "^0.2.2",
-        "tslib": "^2.6.2"
+        "tslib": "^2.2.0"
      },
      "engines": {
-        "node": ">=18.0.0"
+        "node": ">=14.0.0"
      }
    },
    "node_modules/@azure/logger/node_modules/tslib": {
@@ -13139,56 +13072,6 @@
        "url": "https://opencollective.com/typescript-eslint"
      }
    },
-    "node_modules/@typespec/ts-http-runtime": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.2.2.tgz",
-      "integrity": "sha512-Gz/Sm64+Sq/vklJu1tt9t+4R2lvnud8NbTD/ZfpZtMiUX7YeVpCA8j6NSW8ptwcoLL+NmYANwqP8DV0q/bwl2w==",
-      "dependencies": {
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@typespec/ts-http-runtime/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@typespec/ts-http-runtime/node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@typespec/ts-http-runtime/node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@typespec/ts-http-runtime/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
    "node_modules/@ungap/url-search-params": {
      "version": "0.2.2",
      "license": "ISC"
@@ -13357,19 +13240,6 @@
        "node": ">=10.0.0"
      }
    },
-    "node_modules/@xterm/addon-fit": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
-      "integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==",
-      "peerDependencies": {
-        "@xterm/xterm": "^5.0.0"
-      }
-    },
-    "node_modules/@xterm/xterm": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
-      "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A=="
-    },
    "node_modules/@xtuc/ieee754": {
      "version": "1.2.0",
      "license": "BSD-3-Clause"
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
  "main": "index.js",
  "dependencies": {
    "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "4.3.0",
+    "@azure/cosmos": "4.2.0-beta.1",
    "@azure/cosmos-language-service": "0.0.5",
    "@azure/identity": "4.5.0",
    "@azure/msal-browser": "2.14.2",
@@ -46,8 +46,6 @@
    "@types/mkdirp": "1.0.1",
    "@types/node-fetch": "2.5.7",
    "@xmldom/xmldom": "0.7.13",
-    "@xterm/xterm": "5.5.0",
-    "@xterm/addon-fit": "0.10.0",
    "allotment": "1.20.2",
    "applicationinsights": "1.8.0",
    "bootstrap": "3.4.1",
--- a/preview/package-lock.json
+++ b/preview/package-lock.json
@@ -10,7 +10,7 @@
      "hasInstallScript": true,
      "dependencies": {
        "@azure/arm-cosmosdb": "9.1.0",
-        "@azure/cosmos": "4.3.0",
+        "@azure/cosmos": "4.2.0-beta.1",
        "@azure/cosmos-language-service": "0.0.5",
        "@azure/identity": "4.5.0",
        "@azure/msal-browser": "2.14.2",
@@ -377,8 +377,8 @@
      "license": "0BSD"
    },
    "node_modules/@azure/cosmos": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.3.0.tgz",
+      "version": "4.2.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.2.0-beta.1.tgz",
      "integrity": "sha512-mREONehm1DxjEKXGaNU6Wmpf9Ckb9IrhKFXhDFVs45pxmoEb3y2s/Ub0owuFmqlphpcS1zgtYQn5exn+lwnJuQ==",
      "dependencies": {
        "@azure/abort-controller": "^2.0.0",
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -257,7 +257,6 @@ export class Areas {
  public static ShareDialog: string = "Share Access Dialog";
  public static Notebook: string = "Notebook";
  public static Copilot: string = "Copilot";
-  public static CloudShell: string = "Cloud Shell";
 }

 export class HttpHeaders {
--- a/src/Common/IteratorUtilities.ts
+++ b/src/Common/IteratorUtilities.ts
@@ -1,3 +1,4 @@
+import { QueryOperationOptions } from "@azure/cosmos";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as Constants from "../Common/Constants";
 import { QueryResults } from "../Contracts/ViewModels";
@@ -13,14 +14,18 @@ interface QueryResponse {
 }

 export interface MinimalQueryIterator {
-  fetchNext: () => Promise<QueryResponse>;
+  fetchNext: (queryOperationOptions?: QueryOperationOptions) => Promise<QueryResponse>;
 }

 // Pick<QueryIterator<any>, "fetchNext">;

-export function nextPage(documentsIterator: MinimalQueryIterator, firstItemIndex: number): Promise<QueryResults> {
+export function nextPage(
+  documentsIterator: MinimalQueryIterator,
+  firstItemIndex: number,
+  queryOperationOptions?: QueryOperationOptions,
+): Promise<QueryResults> {
  TelemetryProcessor.traceStart(Action.ExecuteQuery);
-  return documentsIterator.fetchNext().then((response) => {
+  return documentsIterator.fetchNext(queryOperationOptions).then((response) => {
    TelemetryProcessor.traceSuccess(Action.ExecuteQuery, { dataExplorerArea: Constants.Areas.Tab });
    const documents = response.resources;
    // eslint-disable-next-line @typescript-eslint/no-explicit-any
--- a/src/Common/QueryError.ts
+++ b/src/Common/QueryError.ts
@@ -1,4 +1,5 @@
 import { monaco } from "Explorer/LazyMonaco";
+import { getRUThreshold, ruThresholdEnabled } from "Shared/StorageUtility";

 export enum QueryErrorSeverity {
  Error = "Error",
@@ -102,9 +103,20 @@ export interface ErrorEnrichment {
  learnMoreUrl?: string;
 }

-const REPLACEMENT_MESSAGES: Record<string, (original: string) => string> = {};
+const REPLACEMENT_MESSAGES: Record<string, (original: string) => string> = {
+  OPERATION_RU_LIMIT_EXCEEDED: (original) => {
+    if (ruThresholdEnabled()) {
+      const threshold = getRUThreshold();
+      return `Query exceeded the Request Unit (RU) limit of ${threshold} RUs. You can change this limit in Data Explorer settings.`;
+    }
+    return original;
+  },
+};

-const HELP_LINKS: Record<string, string> = {};
+const HELP_LINKS: Record<string, string> = {
+  OPERATION_RU_LIMIT_EXCEEDED:
+    "https://learn.microsoft.com/en-us/azure/cosmos-db/data-explorer#configure-request-unit-threshold",
+};

 export default class QueryError {
  message: string;
--- a/src/Common/Tooltip/InfoTooltip.tsx
+++ b/src/Common/Tooltip/InfoTooltip.tsx
@@ -4,18 +4,13 @@ import * as React from "react";
 export interface TooltipProps {
  children: string;
  className?: string;
-  ariaLabelForTooltip?: string;
 }

-export const InfoTooltip: React.FunctionComponent<TooltipProps> = ({
-  children,
-  className,
-  ariaLabelForTooltip = children,
-}: TooltipProps) => {
+export const InfoTooltip: React.FunctionComponent<TooltipProps> = ({ children, className }: TooltipProps) => {
  return (
    <span className={className}>
      <TooltipHost content={children}>
-        <Icon iconName="Info" aria-label={ariaLabelForTooltip} className="panelInfoIcon" tabIndex={0} />
+        <Icon iconName="Info" ariaLabel={children} className="panelInfoIcon" tabIndex={0} />
      </TooltipHost>
    </span>
  );
--- a/src/Common/dataAccess/snapshots/queryDocuments.test.ts.snap
+++ b/src/Common/dataAccess/snapshots/queryDocuments.test.ts.snap
@@ -3,7 +3,6 @@
 exports[`getCommonQueryOptions builds the correct default options objects 1`] = `
 {
  "disableNonStreamingOrderByQuery": true,
-  "enableQueryControl": false,
  "enableScanInQuery": true,
  "forceQueryPlan": true,
  "maxDegreeOfParallelism": 0,
@@ -15,7 +14,6 @@ exports[`getCommonQueryOptions builds the correct default options objects 1`] =
 exports[`getCommonQueryOptions reads from localStorage 1`] = `
 {
  "disableNonStreamingOrderByQuery": true,
-  "enableQueryControl": false,
  "enableScanInQuery": true,
  "forceQueryPlan": true,
  "maxDegreeOfParallelism": 17,
--- a/src/Common/dataAccess/deleteDocument.ts
+++ b/src/Common/dataAccess/deleteDocument.ts
@@ -42,7 +42,6 @@ export interface IBulkDeleteResult {
 export const deleteDocuments = async (
  collection: CollectionBase,
  documentIds: DocumentId[],
-  abortSignal: AbortSignal,
 ): Promise<IBulkDeleteResult[]> => {
  const clearMessage = logConsoleProgress(`Deleting ${documentIds.length} ${getEntityName(true)}`);
  try {
@@ -66,16 +65,12 @@ export const deleteDocuments = async (
        operationType: BulkOperationType.Delete,
      }));

-      const promise = v2Container.items
-        .bulk(operations, undefined, {
-          abortSignal,
-        })
-        .then((bulkResults) => {
-          return bulkResults.map((bulkResult, index) => {
-            const documentId = documentIdsChunk[index];
-            return { ...bulkResult, documentId };
-          });
+      const promise = v2Container.items.bulk(operations).then((bulkResults) => {
+        return bulkResults.map((bulkResult, index) => {
+          const documentId = documentIdsChunk[index];
+          return { ...bulkResult, documentId };
        });
+      });
      promiseArray.push(promise);
    }

--- a/src/Common/dataAccess/queryDocuments.ts
+++ b/src/Common/dataAccess/queryDocuments.ts
@@ -26,7 +26,6 @@ export const getCommonQueryOptions = (options: FeedOptions): FeedOptions => {
    options.maxItemCount ||
    (storedItemPerPageSetting !== undefined && storedItemPerPageSetting) ||
    Queries.itemsPerPage;
-  options.enableQueryControl = LocalStorageUtility.getEntryBoolean(StorageKey.QueryControlEnabled);
  options.maxDegreeOfParallelism = LocalStorageUtility.getEntryNumber(StorageKey.MaxDegreeOfParellism);
  options.disableNonStreamingOrderByQuery = !isVectorSearchEnabled();
  return options;
--- a/src/Common/dataAccess/queryDocumentsPage.ts
+++ b/src/Common/dataAccess/queryDocumentsPage.ts
@@ -1,3 +1,4 @@
+import { QueryOperationOptions } from "@azure/cosmos";
 import { QueryResults } from "../../Contracts/ViewModels";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { getEntityName } from "../DocumentUtility";
@@ -8,12 +9,13 @@ export const queryDocumentsPage = async (
  resourceName: string,
  documentsIterator: MinimalQueryIterator,
  firstItemIndex: number,
+  queryOperationOptions?: QueryOperationOptions,
 ): Promise<QueryResults> => {
  const entityName = getEntityName();
  const clearMessage = logConsoleProgress(`Querying ${entityName} for container ${resourceName}`);

  try {
-    const result: QueryResults = await nextPage(documentsIterator, firstItemIndex);
+    const result: QueryResults = await nextPage(documentsIterator, firstItemIndex, queryOperationOptions);
    const itemCount = (result.documents && result.documents.length) || 0;
    logConsoleInfo(`Successfully fetched ${itemCount} ${entityName} for container ${resourceName}`);
    return result;
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -210,7 +210,7 @@ export interface IndexingPolicy {
 export interface VectorIndex {
  path: string;
  type: "flat" | "diskANN" | "quantizedFlat";
-  vectorIndexShardKey?: string[];
+  diskANNShardKey?: string;
  indexingSearchListSize?: number;
  quantizationByteSize?: number;
 }
--- a/src/Contracts/ViewModels.ts
+++ b/src/Contracts/ViewModels.ts
@@ -1,5 +1,4 @@
 import {
-  ItemDefinition,
  JSONObject,
  QueryMetrics,
  Resource,
@@ -31,11 +30,8 @@ export interface UploadDetailsRecord {
  numFailed: number;
  numThrottled: number;
  errors: string[];
-  resources?: ItemDefinition[];
 }

-export type BulkInsertResult = Omit<UploadDetailsRecord, "fileName">;
-
 export interface QueryResultsMetadata {
  hasMoreResults: boolean;
  firstItemIndex: number;
@@ -50,7 +46,6 @@ export interface QueryResults extends QueryResultsMetadata {
  roundTrips?: number;
  headers?: any;
  queryMetrics?: QueryMetrics;
-  ruThresholdExceeded?: boolean;
 }

 export interface Button {
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -103,23 +103,17 @@ export const createCollectionContextMenuButton = (
      iconSrc: HostedTerminalIcon,
      onClick: () => {
        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) {
+        if (useNotebook.getState().isShellEnabled) {
          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
        } else {
          selectedCollection && selectedCollection.onNewMongoShellClick();
        }
      },
-      label:
-        useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell
-          ? "Open Mongo Shell"
-          : "New Shell",
+      label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
    });
  }

-  if (
-    (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) &&
-    userContext.apiType === "Cassandra"
-  ) {
+  if (useNotebook.getState().isShellEnabled && userContext.apiType === "Cassandra") {
    items.push({
      iconSrc: HostedTerminalIcon,
      onClick: () => {
--- a/src/Explorer/Controls/Settings/SettingsComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.test.tsx
@@ -1,6 +1,7 @@
 import { AuthType } from "AuthType";
 import { shallow } from "enzyme";
 import ko from "knockout";
+import { Features } from "Platform/Hosted/extractFeatures";
 import React from "react";
 import { updateCollection } from "../../../Common/dataAccess/updateCollection";
 import { updateOffer } from "../../../Common/dataAccess/updateOffer";
@@ -252,7 +253,7 @@ describe("SettingsComponent", () => {
  it("should save throughput bucket changes when Save button is clicked", async () => {
    updateUserContext({
      apiType: "SQL",
-      throughputBucketsEnabled: true,
+      features: { enableThroughputBuckets: true } as Features,
      authType: AuthType.AAD,
    });

--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -13,7 +13,7 @@ import {
 } from "Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent";
 import { useDatabases } from "Explorer/useDatabases";
 import { isFabricNative } from "Platform/Fabric/FabricUtil";
-import { isVectorSearchEnabled } from "Utils/CapabilityUtils";
+import { isFullTextSearchEnabled, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { isRunningOnPublicCloud } from "Utils/CloudUtils";
 import * as React from "react";
 import DiscardIcon from "../../../../images/discard.svg";
@@ -188,10 +188,13 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      this.isGlobalSecondaryIndex =
        !!this.collection?.materializedViewDefinition() || !!this.collection?.materializedViews();
      this.isVectorSearchEnabled = isVectorSearchEnabled() && !hasDatabaseSharedThroughput(this.collection);
-      this.isFullTextSearchEnabled = userContext.apiType === "SQL";
+      this.isFullTextSearchEnabled = isFullTextSearchEnabled() && !hasDatabaseSharedThroughput(this.collection);

      this.changeFeedPolicyVisible = userContext.features.enableChangeFeedPolicy;
-      this.throughputBucketsEnabled = userContext.throughputBucketsEnabled;
+      this.throughputBucketsEnabled =
+        userContext.apiType === "SQL" &&
+        userContext.features.enableThroughputBuckets &&
+        userContext.authType === AuthType.AAD;

      // Mongo container with system partition key still treat as "Fixed"
      this.isFixedContainer =
@@ -1071,11 +1074,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
        databaseId: this.collection.databaseId,
        collectionId: this.collection.id(),
        currentOffer: this.collection.offer(),
-        autopilotThroughput: this.collection.offer?.()?.autoscaleMaxThroughput
-          ? this.collection.offer?.()?.autoscaleMaxThroughput
+        autopilotThroughput: this.collection.offer().autoscaleMaxThroughput
+          ? this.collection.offer().autoscaleMaxThroughput
          : undefined,
-        manualThroughput: this.collection.offer?.()?.manualThroughput
-          ? this.collection.offer?.()?.manualThroughput
+        manualThroughput: this.collection.offer().manualThroughput
+          ? this.collection.offer().manualThroughput
          : undefined,
        throughputBuckets: this.state.throughputBuckets,
      });
@@ -1091,7 +1094,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
        currentOffer: this.collection.offer(),
        autopilotThroughput: this.state.isAutoPilotSelected ? this.state.autoPilotThroughput : undefined,
        manualThroughput: this.state.isAutoPilotSelected ? undefined : this.state.throughput,
-        throughputBuckets: this.throughputBucketsEnabled ? this.state.throughputBuckets : undefined,
      };
      if (this.hasProvisioningTypeChanged()) {
        if (this.state.isAutoPilotSelected) {
@@ -1213,7 +1215,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      isFullTextSearchEnabled: this.isFullTextSearchEnabled,
      shouldDiscardContainerPolicies: this.state.shouldDiscardContainerPolicies,
      resetShouldDiscardContainerPolicyChange: this.resetShouldDiscardContainerPolicies,
-      isGlobalSecondaryIndex: this.isGlobalSecondaryIndex,
    };

    const indexingPolicyComponentProps: IndexingPolicyComponentProps = {
@@ -1342,7 +1343,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      });
    }

-    if (this.throughputBucketsEnabled && !hasDatabaseSharedThroughput(this.collection) && this.offer) {
+    if (this.throughputBucketsEnabled) {
      tabs.push({
        tab: SettingsV2TabTypes.ThroughputBucketsTab,
        content: <ThroughputBucketsComponent {...throughputBucketsComponentProps} />,
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerPolicyComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ContainerPolicyComponent.tsx
@@ -22,7 +22,6 @@ export interface ContainerPolicyComponentProps {
  isFullTextSearchEnabled: boolean;
  shouldDiscardContainerPolicies: boolean;
  resetShouldDiscardContainerPolicyChange: () => void;
-  isGlobalSecondaryIndex?: boolean;
 }

 export const ContainerPolicyComponent: React.FC<ContainerPolicyComponentProps> = ({
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx
@@ -143,39 +143,4 @@ describe("SubSettingsComponent", () => {
    expect(subSettingsComponentInstance.getTtlValue(TtlType.On)).toEqual(TtlOn);
    expect(subSettingsComponentInstance.getTtlValue(TtlType.Off)).toEqual(TtlOff);
  });
-
-  it("uniqueKey is visible", () => {
-    updateUserContext({
-      databaseAccount: {
-        properties: {
-          capabilities: [{ name: "EnableSQL" }],
-        },
-      } as DatabaseAccount,
-    });
-    const subSettingsComponent = new SubSettingsComponent(baseProps);
-    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(true);
-  });
-
-  it("uniqueKey not visible due to no keys", () => {
-    const props = {
-      ...baseProps,
-      ...(baseProps.collection.rawDataModel.uniqueKeyPolicy.uniqueKeys = []),
-    };
-    const subSettingsComponent = new SubSettingsComponent(props);
-    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(false);
-  });
-
-  it("uniqueKey not visible for API", () => {
-    const newContainer = new Explorer();
-    updateUserContext({
-      databaseAccount: {
-        properties: {
-          capabilities: [{ name: "EnableMongo" }],
-        },
-      } as DatabaseAccount,
-    });
-    const props = { ...baseProps, container: newContainer };
-    const subSettingsComponent = new SubSettingsComponent(props);
-    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(false);
-  });
 });
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
@@ -63,16 +63,12 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
  private geospatialVisible: boolean;
  private partitionKeyValue: string;
  private partitionKeyName: string;
-  private uniqueKeyName: string;
-  private uniqueKeyValue: string;

  constructor(props: SubSettingsComponentProps) {
    super(props);
    this.geospatialVisible = userContext.apiType === "SQL";
    this.partitionKeyName = userContext.apiType === "Mongo" ? "Shard key" : "Partition key";
    this.partitionKeyValue = this.getPartitionKeyValue();
-    this.uniqueKeyName = "Unique keys";
-    this.uniqueKeyValue = this.getUniqueKeyValue();
  }

  componentDidMount(): void {
@@ -355,28 +351,6 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
  public isLargePartitionKeyEnabled = (): boolean => this.props.collection.partitionKey?.version >= 2;
  public isHierarchicalPartitionedContainer = (): boolean => this.props.collection.partitionKey?.kind === "MultiHash";

-  public getUniqueKeyVisible = (): boolean => {
-    return this.props.collection.rawDataModel.uniqueKeyPolicy?.uniqueKeys.length > 0 && userContext.apiType === "SQL";
-  };
-
-  private getUniqueKeyValue = (): string => {
-    const paths = this.props.collection.rawDataModel.uniqueKeyPolicy?.uniqueKeys?.[0]?.paths;
-    return paths?.join(", ") || "";
-  };
-
-  private getUniqueKeyComponent = (): JSX.Element => (
-    <Stack {...titleAndInputStackProps}>
-      {this.getUniqueKeyVisible() && (
-        <TextField
-          label={this.uniqueKeyName}
-          disabled
-          styles={getTextFieldStyles(undefined, undefined)}
-          defaultValue={this.uniqueKeyValue}
-        />
-      )}
-    </Stack>
-  );
-
  public render(): JSX.Element {
    return (
      <Stack {...subComponentStackProps}>
@@ -389,8 +363,6 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
        {this.props.changeFeedPolicyVisible && this.getChangeFeedComponent()}

        {this.getPartitionKeyComponent()}
-
-        {this.getUniqueKeyComponent()}
      </Stack>
    );
  }
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent.test.tsx
@@ -26,7 +26,7 @@ describe("ThroughputBucketsComponent", () => {

  it("renders the correct number of buckets", () => {
    render(<ThroughputBucketsComponent {...defaultProps} />);
-    expect(screen.getAllByText(/Bucket \d+/)).toHaveLength(5);
+    expect(screen.getAllByText(/Group \d+/)).toHaveLength(5);
  });

  it("renders buckets in the correct order even if input is unordered", () => {
@@ -36,14 +36,8 @@ describe("ThroughputBucketsComponent", () => {
    ];
    render(<ThroughputBucketsComponent {...defaultProps} currentBuckets={unorderedBuckets} />);

-    const bucketLabels = screen.getAllByText(/Bucket \d+/).map((el) => el.textContent);
-    expect(bucketLabels).toEqual([
-      "Bucket 1 (Data Explorer Query Bucket)",
-      "Bucket 2",
-      "Bucket 3",
-      "Bucket 4",
-      "Bucket 5",
-    ]);
+    const bucketLabels = screen.getAllByText(/Group \d+/).map((el) => el.textContent);
+    expect(bucketLabels).toEqual(["Group 1 (Data Explorer Query Bucket)", "Group 2", "Group 3", "Group 4", "Group 5"]);
  });

  it("renders all provided buckets even if they exceed the max default bucket count", () => {
@@ -59,7 +53,7 @@ describe("ThroughputBucketsComponent", () => {

    render(<ThroughputBucketsComponent {...defaultProps} currentBuckets={oversizedBuckets} />);

-    expect(screen.getAllByText(/Bucket \d+/)).toHaveLength(7);
+    expect(screen.getAllByText(/Group \d+/)).toHaveLength(7);

    expect(screen.getByDisplayValue("50")).toBeInTheDocument();
    expect(screen.getByDisplayValue("60")).toBeInTheDocument();
@@ -177,7 +171,7 @@ describe("ThroughputBucketsComponent", () => {

  it("ensures default buckets are used when no buckets are provided", () => {
    render(<ThroughputBucketsComponent {...defaultProps} currentBuckets={[]} />);
-    expect(screen.getAllByText(/Bucket \d+/)).toHaveLength(5);
+    expect(screen.getAllByText(/Group \d+/)).toHaveLength(5);
    expect(screen.getAllByDisplayValue("100")).toHaveLength(5);
  });
 });
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent.tsx
@@ -76,7 +76,7 @@ export const ThroughputBucketsComponent: FC<ThroughputBucketsComponentProps> = (
              value={bucket.maxThroughputPercentage}
              onChange={(newValue) => handleBucketChange(bucket.id, newValue)}
              showValue={false}
-              label={`Bucket ${bucket.id}${bucket.id === 1 ? " (Data Explorer Query Bucket)" : ""}`}
+              label={`Group ${bucket.id}${bucket.id === 1 ? " (Data Explorer Query Bucket)" : ""}`}
              styles={{ root: { flex: 2, maxWidth: 400 } }}
              disabled={bucket.maxThroughputPercentage === 100}
            />
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
@@ -285,7 +285,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
        serverId,
        numberOfRegions,
        isMultimaster,
-        false,
+        true,
      );
      return (
        <div>
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/SubSettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/SubSettingsComponent.test.tsx.snap
@@ -231,34 +231,6 @@ exports[`SubSettingsComponent analyticalTimeToLive hidden 1`] = `
      Non-hierarchically partitioned container.
    </Text>
  </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;

@@ -548,34 +520,6 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
      Non-hierarchically partitioned container.
    </Text>
  </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;

@@ -825,34 +769,6 @@ exports[`SubSettingsComponent changeFeedPolicy hidden 1`] = `
      Non-hierarchically partitioned container.
    </Text>
  </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;

@@ -1167,34 +1083,6 @@ exports[`SubSettingsComponent renders 1`] = `
      Non-hierarchically partitioned container.
    </Text>
  </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;

@@ -1483,33 +1371,5 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
      Non-hierarchically partitioned container.
    </Text>
  </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;
--- a/src/Explorer/Controls/Settings/TestUtils.tsx
+++ b/src/Explorer/Controls/Settings/TestUtils.tsx
@@ -17,15 +17,7 @@ export const collection = {
    includedPaths: [],
    excludedPaths: [],
  }),
-  rawDataModel: {
-    uniqueKeyPolicy: {
-      uniqueKeys: [
-        {
-          paths: ["/id"],
-        },
-      ],
-    },
-  },
+  uniqueKeyPolicy: {} as DataModels.UniqueKeyPolicy,
  usageSizeInKB: ko.observable(100),
  offer: ko.observable<DataModels.Offer>({
    autoscaleMaxThroughput: undefined,
--- a/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
@@ -71,18 +71,8 @@ exports[`SettingsComponent renders 1`] = `
              "partitionKeyProperties": [
                "partitionKey",
              ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
              "readSettings": [Function],
+              "uniqueKeyPolicy": {},
              "usageSizeInKB": [Function],
              "vectorEmbeddingPolicy": [Function],
            }
@@ -163,18 +153,8 @@ exports[`SettingsComponent renders 1`] = `
              "partitionKeyProperties": [
                "partitionKey",
              ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
              "readSettings": [Function],
+              "uniqueKeyPolicy": {},
              "usageSizeInKB": [Function],
              "vectorEmbeddingPolicy": [Function],
            }
@@ -198,32 +178,6 @@ exports[`SettingsComponent renders 1`] = `
          timeToLiveSecondsBaseline={5}
        />
      </PivotItem>
-      <PivotItem
-        headerText="Container Policies"
-        itemKey="ContainerVectorPolicyTab"
-        key="ContainerVectorPolicyTab"
-        style={
-          {
-            "marginTop": 20,
-          }
-        }
-      >
-        <ContainerPolicyComponent
-          fullTextPolicy={{}}
-          fullTextPolicyBaseline={{}}
-          isFullTextSearchEnabled={true}
-          isGlobalSecondaryIndex={true}
-          isVectorSearchEnabled={false}
-          onFullTextPolicyChange={[Function]}
-          onFullTextPolicyDirtyChange={[Function]}
-          onVectorEmbeddingPolicyChange={[Function]}
-          onVectorEmbeddingPolicyDirtyChange={[Function]}
-          resetShouldDiscardContainerPolicyChange={[Function]}
-          shouldDiscardContainerPolicies={false}
-          vectorEmbeddingPolicy={{}}
-          vectorEmbeddingPolicyBaseline={{}}
-        />
-      </PivotItem>
      <PivotItem
        headerText="Indexing Policy"
        itemKey="IndexingPolicyTab"
@@ -320,18 +274,8 @@ exports[`SettingsComponent renders 1`] = `
              "partitionKeyProperties": [
                "partitionKey",
              ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
              "readSettings": [Function],
+              "uniqueKeyPolicy": {},
              "usageSizeInKB": [Function],
              "vectorEmbeddingPolicy": [Function],
            }
@@ -460,18 +404,8 @@ exports[`SettingsComponent renders 1`] = `
              "partitionKeyProperties": [
                "partitionKey",
              ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
              "readSettings": [Function],
+              "uniqueKeyPolicy": {},
              "usageSizeInKB": [Function],
              "vectorEmbeddingPolicy": [Function],
            }
--- a/src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx
+++ b/src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx
@@ -1,4 +1,4 @@
-import { Stack, Text } from "@fluentui/react";
+import { Text } from "@fluentui/react";
 import React, { FunctionComponent } from "react";
 import { InfoTooltip } from "../../../../Common/Tooltip/InfoTooltip";
 import * as SharedConstants from "../../../../Shared/Constants";
@@ -44,42 +44,33 @@ export const CostEstimateText: FunctionComponent<CostEstimateTextProps> = ({
  const currencySign: string = getCurrencySign(serverId);
  const multiplier = getMultimasterMultiplier(numberOfRegions, multimasterEnabled);
  const pricePerRu = isAutoscale ? getAutoscalePricePerRu(serverId, multiplier) : getPricePerRu(serverId, multiplier);
-  const estimatedMonthlyCost = "Estimated monthly cost";

-  const iconWithEstimatedCostDisclaimer: JSX.Element = (
-    <InfoTooltip ariaLabelForTooltip={`${estimatedMonthlyCost} ${currency} ${estimatedCostDisclaimer}`}>
-      {estimatedCostDisclaimer}
-    </InfoTooltip>
-  );
+  const iconWithEstimatedCostDisclaimer: JSX.Element = <InfoTooltip>{estimatedCostDisclaimer}</InfoTooltip>;

  if (isAutoscale) {
    return (
-      <Stack style={{ marginBottom: 6 }}>
-        <Text variant="small">
-          {estimatedMonthlyCost} ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
-          <b>
-            {currencySign + calculateEstimateNumber(monthlyPrice / 10)} -{" "}
-            {currencySign + calculateEstimateNumber(monthlyPrice)}{" "}
-          </b>
-          ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits / 10} - {requestUnits}{" "}
-          RU/s, {currencySign + pricePerRu}/RU)
-        </Text>
-      </Stack>
+      <Text variant="small">
+        Estimated monthly cost ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
+        <b>
+          {currencySign + calculateEstimateNumber(monthlyPrice / 10)} -{" "}
+          {currencySign + calculateEstimateNumber(monthlyPrice)}{" "}
+        </b>
+        ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits / 10} - {requestUnits}{" "}
+        RU/s, {currencySign + pricePerRu}/RU)
+      </Text>
    );
  }

  return (
-    <Stack style={{ marginBottom: 8 }}>
-      <Text variant="small">
-        Estimated cost ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
-        <b>
-          {currencySign + calculateEstimateNumber(hourlyPrice)} hourly /{" "}
-          {currencySign + calculateEstimateNumber(dailyPrice)} daily /{" "}
-          {currencySign + calculateEstimateNumber(monthlyPrice)} monthly{" "}
-        </b>
-        ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits}RU/s,{" "}
-        {currencySign + pricePerRu}/RU)
-      </Text>
-    </Stack>
+    <Text variant="small">
+      Estimated cost ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
+      <b>
+        {currencySign + calculateEstimateNumber(hourlyPrice)} hourly /{" "}
+        {currencySign + calculateEstimateNumber(dailyPrice)} daily /{" "}
+        {currencySign + calculateEstimateNumber(monthlyPrice)} monthly{" "}
+      </b>
+      ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits}RU/s,{" "}
+      {currencySign + pricePerRu}/RU)
+    </Text>
  );
 };
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
@@ -1,6 +1,5 @@
-import { Checkbox, DirectionalHint, Link, Separator, Stack, Text, TextField, TooltipHost } from "@fluentui/react";
+import { Checkbox, DirectionalHint, Link, Stack, Text, TextField, TooltipHost } from "@fluentui/react";
 import { getWorkloadType } from "Common/DatabaseAccountUtility";
-import { CostEstimateText } from "Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText";
 import { useDatabases } from "Explorer/useDatabases";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as Constants from "../../../Common/Constants";
@@ -10,8 +9,8 @@ import { userContext } from "../../../UserContext";
 import { getCollectionName } from "../../../Utils/APITypeUtils";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import * as PricingUtils from "../../../Utils/PricingUtils";
+import { CostEstimateText } from "./CostEstimateText/CostEstimateText";
 import "./ThroughputInput.less";
-import { isFabricNative } from "../../../Platform/Fabric/FabricUtil";

 export interface ThroughputInputProps {
  isDatabase: boolean;
@@ -44,8 +43,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
  if (
    isFreeTier ||
    isQuickstart ||
-    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(workloadType) ||
-    isFabricNative()
+    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(workloadType)
  ) {
    defaultThroughput = AutoPilotUtils.autoPilotThroughput1K;
  } else if (workloadType === Constants.WorkloadType.Production) {
@@ -232,92 +230,53 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
          </div>
        </Stack>
      )}
-
      {isAutoscaleSelected && (
        <Stack className="throughputInputSpacing">
-          <Text style={{ marginTop: -2, fontSize: 12 }}>
-            Your container throughput will automatically scale up to the maximum value you select, from a minimum of 10%
-            of that value.
-          </Text>
-          <Stack horizontal verticalAlign="end" tokens={{ childrenGap: 8 }}>
-            <Stack tokens={{ childrenGap: 4 }}>
-              <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 4 }}>
-                <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }}>
-                  Minimum RU/s
-                </Text>
-                <InfoTooltip>The minimum RU/s your container will scale to</InfoTooltip>
-              </Stack>
-              <Text
-                style={{
-                  fontFamily: "Segoe UI",
-                  width: 70,
-                  height: 27,
-                  border: "none",
-                  fontSize: 14,
-                  backgroundColor: "transparent",
-                  fontWeight: 400,
-                  display: "flex",
-                  alignItems: "center",
-                  justifyContent: "center",
-                }}
-              >
-                {Math.round(throughput / 10).toString()}
-              </Text>
-            </Stack>
-
-            <Text
-              style={{
-                fontFamily: "Segoe UI",
-                fontSize: 12,
-                fontWeight: 400,
-                paddingBottom: 6,
-              }}
+          <Text variant="small" aria-label="capacity calculator of azure cosmos db">
+            Estimate your required RU/s with{" "}
+            <Link
+              className="underlinedLink outlineNone"
+              target="_blank"
+              href="https://cosmos.azure.com/capacitycalculator/"
+              aria-label="capacity calculator of azure cosmos db"
            >
-              x 10 =
-            </Text>
+              capacity calculator
+            </Link>
+            .
+          </Text>

-            <Stack tokens={{ childrenGap: 4 }}>
-              <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 4 }}>
-                <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }}>
-                  Maximum RU/s
-                </Text>
-                <InfoTooltip>{getAutoScaleTooltip()}</InfoTooltip>
-              </Stack>
-              <TextField
-                id="autoscaleRUValueField"
-                type="number"
-                styles={{
-                  fieldGroup: { width: 100, height: 27, flexShrink: 0 },
-                  field: { fontSize: 14, fontWeight: 400 },
-                }}
-                onChange={(_event, newInput?: string) => onThroughputValueChange(newInput)}
-                step={AutoPilotUtils.autoPilotIncrementStep}
-                min={AutoPilotUtils.autoPilotThroughput1K}
-                max={isSharded ? Number.MAX_SAFE_INTEGER.toString() : "10000"}
-                value={throughput.toString()}
-                ariaLabel={`${isDatabase ? "Database" : getCollectionName()} max RU/s`}
-                required={true}
-                errorMessage={throughputError}
-              />
-            </Stack>
+          <Stack horizontal>
+            <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }} aria-label="maxRUDescription">
+              {isDatabase ? "Database" : getCollectionName()} Max RU/s
+            </Text>
+            <InfoTooltip>{getAutoScaleTooltip()}</InfoTooltip>
          </Stack>

-          <CostEstimateText requestUnits={throughput} isAutoscale={isAutoscaleSelected} />
-          <Stack className="throughputInputSpacing">
-            <Text variant="small" aria-label="ruDescription">
-              Estimate your required RU/s with&nbsp;
-              <Link
-                className="underlinedLink"
-                target="_blank"
-                href="https://cosmos.azure.com/capacitycalculator/"
-                aria-label="Capacity calculator"
-              >
-                capacity calculator
-              </Link>
-              .
-            </Text>
-          </Stack>
-          <Separator className="panelSeparator" style={{ paddingTop: -8, paddingBottom: -8 }} />
+          <TextField
+            id="autoscaleRUValueField"
+            type="number"
+            styles={{
+              fieldGroup: { width: 300, height: 27 },
+              field: { fontSize: 12 },
+            }}
+            onChange={(event, newInput?: string) => onThroughputValueChange(newInput)}
+            step={AutoPilotUtils.autoPilotIncrementStep}
+            min={AutoPilotUtils.autoPilotThroughput1K}
+            max={isSharded ? Number.MAX_SAFE_INTEGER.toString() : "10000"}
+            value={throughput.toString()}
+            ariaLabel={`${isDatabase ? "Database" : getCollectionName()} max RU/s`}
+            required={true}
+            errorMessage={throughputError}
+          />
+
+          <Text variant="small">
+            Your {isDatabase ? "database" : getCollectionName().toLocaleLowerCase()} throughput will automatically scale
+            from{" "}
+            <b>
+              {AutoPilotUtils.getMinRUsBasedOnUserInput(throughput)} RU/s (10% of max RU/s) - {throughput} RU/s
+            </b>{" "}
+            based on usage.
+          </Text>
        </Stack>
      )}

@@ -341,6 +300,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
            </Text>
            <InfoTooltip>{getAutoScaleTooltip()}</InfoTooltip>
          </Stack>
+
          <TooltipHost
            directionalHint={DirectionalHint.topLeftEdge}
            content={
@@ -365,10 +325,11 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
              errorMessage={throughputError}
            />
          </TooltipHost>
-          <CostEstimateText requestUnits={throughput} isAutoscale={isAutoscaleSelected} />
        </Stack>
      )}

+      <CostEstimateText requestUnits={throughput} isAutoscale={isAutoscaleSelected} />
+
      {throughput > SharedConstants.CollectionCreation.DefaultCollectionRUs100K && (
        <Stack horizontal verticalAlign="start">
          <Checkbox
--- a/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
+++ b/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
--- a/src/Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent.tsx
+++ b/src/Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent.tsx
@@ -9,7 +9,6 @@ import {
  Stack,
  TextField,
 } from "@fluentui/react";
-import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { VectorEmbedding, VectorIndex } from "Contracts/DataModels";
 import { CollapsibleSectionComponent } from "Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent";
 import {
@@ -30,7 +29,6 @@ export interface IVectorEmbeddingPoliciesComponentProps {
  discardChanges?: boolean;
  onChangesDiscarded?: () => void;
  disabled?: boolean;
-  isGlobalSecondaryIndex?: boolean;
 }

 export interface VectorEmbeddingPolicyData {
@@ -41,7 +39,8 @@ export interface VectorEmbeddingPolicyData {
  indexType: VectorIndex["type"] | "none";
  pathError: string;
  dimensionsError: string;
-  vectorIndexShardKey?: string[];
+  diskANNShardKey?: string;
+  diskANNShardKeyError?: string;
  indexingSearchListSize?: number;
  indexingSearchListSizeError?: string;
  quantizationByteSize?: number;
@@ -88,7 +87,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
  discardChanges,
  onChangesDiscarded,
  disabled,
-  isGlobalSecondaryIndex,
 }): JSX.Element => {
  const onVectorEmbeddingPathError = (path: string, index?: number): string => {
    let error = "";
@@ -134,6 +132,12 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
    return error;
  };

+  //TODO: no restrictions yet due to this field being removed for now.
+  // Uncomment and replace with validation code when field is reinstated
+  // const onDiskANNShardKeyError = (shardKey: string): string => {
+  //   return "";
+  // };
+
  const initializeData = (vectorEmbeddings: VectorEmbedding[], vectorIndexes: VectorIndex[]) => {
    const mergedData: VectorEmbeddingPolicyData[] = [];
    vectorEmbeddings.forEach((embedding) => {
@@ -143,7 +147,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
        indexType: matchingIndex?.type || "none",
        indexingSearchListSize: matchingIndex?.indexingSearchListSize || undefined,
        quantizationByteSize: matchingIndex?.quantizationByteSize || undefined,
-        vectorIndexShardKey: matchingIndex?.vectorIndexShardKey || undefined,
        pathError: onVectorEmbeddingPathError(embedding.path),
        dimensionsError: onVectorEmbeddingDimensionError(embedding.dimensions, matchingIndex?.type || "none"),
      });
@@ -183,7 +186,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
            type: policy.indexType,
            indexingSearchListSize: policy.indexingSearchListSize,
            quantizationByteSize: policy.quantizationByteSize,
-            vectorIndexShardKey: policy.vectorIndexShardKey,
          }) as VectorIndex,
      );
    const validationPassed = vectorEmbeddingPolicyData.every(
@@ -245,16 +247,20 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
    setVectorEmbeddingPolicyData(vectorEmbeddings);
  };

-  const onShardKeyChange = (index: number, event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.target.value.trim();
-    const vectorEmbeddings = [...vectorEmbeddingPolicyData];
-    if (!vectorEmbeddings[index]?.vectorIndexShardKey?.[0] && !value.startsWith("/")) {
-      vectorEmbeddings[index].vectorIndexShardKey = ["/" + value];
-    } else {
-      vectorEmbeddings[index].vectorIndexShardKey = [value];
-    }
-    setVectorEmbeddingPolicyData(vectorEmbeddings);
-  };
+  // TODO: uncomment after Ignite
+  // DiskANNShardKey was removed for Ignite due to backend problems. Leaving this here as it will be reinstated immediately after Ignite
+  // const onDiskANNShardKeyChange = (index: number, event: React.ChangeEvent<HTMLInputElement>) => {
+  //   const value = event.target.value.trim();
+  //   const vectorEmbeddings = [...vectorEmbeddingPolicyData];
+  //   if (!vectorEmbeddings[index]?.diskANNShardKey && !value.startsWith("/")) {
+  //     vectorEmbeddings[index].diskANNShardKey = "/" + value;
+  //   } else {
+  //     vectorEmbeddings[index].diskANNShardKey = value;
+  //   }
+  //   const error = onDiskANNShardKeyError(value);
+  //   vectorEmbeddings[index].diskANNShardKeyError = error;
+  //   setVectorEmbeddingPolicyData(vectorEmbeddings);
+  // }

  const onVectorEmbeddingPolicyChange = (
    index: number,
@@ -286,11 +292,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
    setVectorEmbeddingPolicyData(vectorEmbeddings);
  };

-  const getQuantizationByteSizeTooltipContent = (): string => {
-    const containerName: string = isGlobalSecondaryIndex ? "global secondary index" : "container";
-    return `This is dynamically set by the ${containerName} if left blank, or it can be set to a fixed number`;
-  };
-
  return (
    <Stack tokens={{ childrenGap: 4 }}>
      {vectorEmbeddingPolicyData &&
@@ -401,7 +402,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
                        styles={labelStyles}
                      >
                        Quantization byte size
-                        <InfoTooltip>{getQuantizationByteSizeTooltipContent()}</InfoTooltip>
                      </Label>
                      <TextField
                        disabled={
@@ -431,18 +431,26 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
                        }
                      />
                    </Stack>
-                    <Stack style={{ marginLeft: "10px" }}>
-                      <Label disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"} styles={labelStyles}>
-                        Vector index shard key
-                      </Label>
+                    {/*TODO: uncomment after Ignite */}
+                    {/* DiskANNShardKey was removed for Ignite due to backend problems. Leaving this here as it will be reinstated immediately after Ignite
+                    <Stack
+                      style={{ marginLeft: "10px" }}
+                    >
+                      <Label
+                        disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"}
+                        styles={labelStyles}
+                      >DiskANN shard key</Label>
                      <TextField
                        disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"}
-                        id={`vector-policy-vectorIndexShardKey-${index + 1}`}
+                        id={`vector-policy-diskANNShardKey-${index + 1}`}
                        styles={textFieldStyles}
-                        value={String(vectorEmbeddingPolicy.vectorIndexShardKey?.[0] ?? "")}
-                        onChange={(event: React.ChangeEvent<HTMLInputElement>) => onShardKeyChange(index, event)}
+                        value={String(vectorEmbeddingPolicy.diskANNShardKey || "")}
+                        onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                          onDiskANNShardKeyChange(index, event)
+                        }
                      />
                    </Stack>
+                    */}
                  </Stack>
                )}
              </Stack>
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -12,7 +12,6 @@ import { isFabricMirrored, isFabricMirroredKey, scheduleRefreshFabricToken } fro
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { acquireMsalTokenForAccount } from "Utils/AuthorizationUtils";
 import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointUtils";
-import { featureRegistered } from "Utils/FeatureRegistrationUtils";
 import { update } from "Utils/arm/generatedClients/cosmos/databaseAccounts";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import * as ko from "knockout";
@@ -31,7 +30,6 @@ import { readDatabases } from "../Common/dataAccess/readDatabases";
 import * as DataModels from "../Contracts/DataModels";
 import { ContainerConnectionInfo, IPhoenixServiceInfo, IProvisionData, IResponse } from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
-import { UploadDetailsRecord } from "../Contracts/ViewModels";
 import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
 import { PhoenixClient } from "../Phoenix/PhoenixClient";
 import * as ExplorerSettings from "../Shared/ExplorerSettings";
@@ -284,42 +282,6 @@ export default class Explorer {
    }
  }

-  public openInVsCode(): void {
-    const activeTab = useTabs.getState().activeTab;
-    const resourceId = encodeURIComponent(userContext.databaseAccount.id);
-    const database = encodeURIComponent(activeTab?.collection?.databaseId);
-    const container = encodeURIComponent(activeTab?.collection?.id());
-    const baseUrl = `vscode://ms-azuretools.vscode-cosmosdb?resourceId=${resourceId}`;
-    const vscodeUrl = activeTab ? `${baseUrl}&database=${database}&container=${container}` : baseUrl;
-
-    const openVSCodeDialogProps: DialogProps = {
-      linkProps: {
-        linkText: "Download Visual Studio Code",
-        linkUrl: "https://code.visualstudio.com/download",
-      },
-      isModal: true,
-      title: `Open your Azure Cosmos DB account in Visual Studio Code`,
-      subText: `Please ensure Visual Studio Code is installed on your device.
-      If you don't have it installed, please download it from the link below.`,
-      primaryButtonText: "Open in VS Code",
-      secondaryButtonText: "Cancel",
-
-      onPrimaryButtonClick: () => {
-        try {
-          window.location.href = vscodeUrl;
-          TelemetryProcessor.traceStart(Action.OpenVSCode);
-        } catch (error) {
-          logConsoleError(`Failed to open VS Code: ${getErrorMessage(error)}`);
-        }
-      },
-      onSecondaryButtonClick: () => {
-        useDialog.getState().closeDialog();
-        TelemetryProcessor.traceCancel(Action.OpenVSCode);
-      },
-    };
-    useDialog.getState().openDialog(openVSCodeDialogProps);
-  }
-
  public async openCESCVAFeedbackBlade(): Promise<void> {
    sendMessage({ type: MessageTypes.OpenCESCVAFeedbackBlade });
    Logger.logInfo(
@@ -948,9 +910,7 @@ export default class Explorer {
  }

  public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-    if (userContext.features.enableCloudShell) {
-      this.connectToNotebookTerminal(kind);
-    } else if (useNotebook.getState().isPhoenixFeatures) {
+    if (useNotebook.getState().isPhoenixFeatures) {
      await this.allocateContainer(PoolIdType.DefaultPoolId);
      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
      if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {
@@ -1116,8 +1076,8 @@ export default class Explorer {
    }
  }

-  public openUploadItemsPane(onUpload?: (data: UploadDetailsRecord[]) => void): void {
-    useSidePanel.getState().openSidePanel("Upload " + getUploadName(), <UploadItemsPane onUpload={onUpload} />);
+  public openUploadItemsPane(): void {
+    useSidePanel.getState().openSidePanel("Upload " + getUploadName(), <UploadItemsPane />);
  }
  public openExecuteSprocParamsPanel(storedProcedure: StoredProcedure): void {
    useSidePanel
@@ -1125,7 +1085,7 @@ export default class Explorer {
      .openSidePanel("Input parameters", <ExecuteSprocParamsPane storedProcedure={storedProcedure} />);
  }

-  public getDownloadModalContent(fileName: string): JSX.Element {
+  public getDownloadModalConent(fileName: string): JSX.Element {
    if (useNotebook.getState().isPhoenixNotebooks) {
      return (
        <>
@@ -1171,11 +1131,6 @@ export default class Explorer {
      await this.initNotebooks(userContext.databaseAccount);
    }

-    if (userContext.authType === AuthType.AAD && userContext.apiType === "SQL") {
-      const throughputBucketsEnabled = await featureRegistered(userContext.subscriptionId, "ThroughputBucketing");
-      updateUserContext({ throughputBucketsEnabled });
-    }
-
    this.refreshSampleData();
  }

--- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
@@ -16,12 +16,7 @@ import * as StorageUtility from "../../../Shared/StorageUtility";
 import { LocalStorageUtility, StorageKey } from "../../../Shared/StorageUtility";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-import {
-  logConsoleError,
-  logConsoleInfo,
-  logConsoleProgress,
-  logConsoleWarning,
-} from "../../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Utils/NotificationConsoleUtils";
 import { EditorReact } from "../../Controls/Editor/EditorReact";
 import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
 import * as TabComponent from "../../Controls/Tabs/TabComponent";
@@ -1088,7 +1083,6 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
  public static reportToConsole(type: ConsoleDataType.InProgress, msg: string, ...errorData: any[]): () => void;
  public static reportToConsole(type: ConsoleDataType.Info, msg: string, ...errorData: any[]): void;
  public static reportToConsole(type: ConsoleDataType.Error, msg: string, ...errorData: any[]): void;
-  public static reportToConsole(type: ConsoleDataType.Warning, msg: string, ...errorData: any[]): void;
  public static reportToConsole(type: ConsoleDataType, msg: string, ...errorData: any[]): void | (() => void) {
    let errorDataStr = "";
    if (errorData && errorData.length > 0) {
@@ -1105,8 +1099,6 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
        return logConsoleInfo(consoleMessage);
      case ConsoleDataType.InProgress:
        return logConsoleProgress(consoleMessage);
-      case ConsoleDataType.Warning:
-        return logConsoleWarning(consoleMessage);
    }
  }

--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -14,7 +14,6 @@ import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
 import OpenInTabIcon from "../../../../images/open-in-tab.svg";
 import SettingsIcon from "../../../../images/settings_15x15.svg";
 import SynapseIcon from "../../../../images/synapse-link.svg";
-import VSCodeIcon from "../../../../images/vscode.svg";
 import { AuthType } from "../../../AuthType";
 import * as Constants from "../../../Common/Constants";
 import { Platform, configContext } from "../../../ConfigContext";
@@ -61,10 +60,6 @@ export function createStaticCommandBarButtons(
      addDivider();
      buttons.push(addSynapseLink);
    }
-    if (userContext.apiType !== "Gremlin") {
-      const addVsCode = createOpenVsCodeDialogButton(container);
-      buttons.push(addVsCode);
-    }
  }

  if (isDataplaneRbacSupported(userContext.apiType)) {
@@ -131,14 +126,13 @@ export function createContextCommandBarButtons(
  const buttons: CommandButtonComponentProps[] = [];

  if (!selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") {
-    const label =
-      useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell ? "Open Mongo Shell" : "New Shell";
+    const label = useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell";
    const newMongoShellBtn: CommandButtonComponentProps = {
      iconSrc: HostedTerminalIcon,
      iconAlt: label,
      onCommandClick: () => {
        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) {
+        if (useNotebook.getState().isShellEnabled) {
          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
        } else {
          selectedCollection && selectedCollection.onNewMongoShellClick();
@@ -152,7 +146,7 @@ export function createContextCommandBarButtons(
  }

  if (
-    (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) &&
+    useNotebook.getState().isShellEnabled &&
    !selectedNodeState.isDatabaseNodeOrNoneSelected() &&
    userContext.apiType === "Cassandra"
  ) {
@@ -273,18 +267,6 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
  };
 }

-function createOpenVsCodeDialogButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Visual Studio Code";
-  return {
-    iconSrc: VSCodeIcon,
-    iconAlt: label,
-    onCommandClick: () => container.openInVsCode(),
-    commandButtonLabel: label,
-    hasPopup: false,
-    ariaLabel: label,
-  };
-}
-
 function createLoginForEntraIDButton(container: Explorer): CommandButtonComponentProps {
  if (configContext.platform !== Platform.Portal) {
    return undefined;
@@ -473,7 +455,7 @@ function createOpenTerminalButtonByKind(
    iconSrc: HostedTerminalIcon,
    iconAlt: label,
    onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled || userContext.features.enableCloudShell) {
+      if (useNotebook.getState().isNotebookEnabled) {
        container.openNotebookTerminal(terminalKind);
      }
    },
@@ -517,6 +499,6 @@ export function createPostgreButtons(container: Explorer): CommandButtonComponen

 export function createVCoreMongoButtons(container: Explorer): CommandButtonComponentProps[] {
  const openVCoreMongoTerminalButton = createOpenTerminalButtonByKind(container, ViewModels.TerminalKind.VCoreMongo);
-  const addVsCode = createOpenVsCodeDialogButton(container);
-  return [openVCoreMongoTerminalButton, addVsCode];
+
+  return [openVCoreMongoTerminalButton];
 }
--- a/src/Explorer/Menus/NotificationConsole/ConsoleData.tsx
+++ b/src/Explorer/Menus/NotificationConsole/ConsoleData.tsx
@@ -13,5 +13,4 @@ export enum ConsoleDataType {
  Info = 0,
  Error = 1,
  InProgress = 2,
-  Warning = 3,
 }
--- a/src/Explorer/Menus/NotificationConsole/NotificationConsole.less
+++ b/src/Explorer/Menus/NotificationConsole/NotificationConsole.less
@@ -173,20 +173,8 @@
                .message {
                    flex-grow: 1;
                    white-space:pre-wrap;
-                    overflow-wrap: break-word;
-                    word-break: break-word;
                }
            }
        }
    }
-
-  @media (max-width: 768px) {
-    .notificationConsoleContents {
-      overflow-y: auto;
-
-      .notificationConsoleData {
-        overflow: visible;
-      }
-    }
-  }
 }
--- a/src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx
+++ b/src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx
@@ -14,7 +14,6 @@ import ErrorRedIcon from "../../../../images/error_red.svg";
 import infoBubbleIcon from "../../../../images/info-bubble-9x9.svg";
 import InfoIcon from "../../../../images/info_color.svg";
 import LoadingIcon from "../../../../images/loading.svg";
-import WarningIcon from "../../../../images/warning.svg";
 import { ClientDefaults, KeyCodes } from "../../../Common/Constants";
 import { userContext } from "../../../UserContext";
 import { useNotificationConsole } from "../../../hooks/useNotificationConsole";
@@ -92,9 +91,6 @@ export class NotificationConsoleComponent extends React.Component<
    const numInfoItems = this.state.allConsoleData.filter(
      (data: ConsoleData) => data.type === ConsoleDataType.Info,
    ).length;
-    const numWarningItems = this.state.allConsoleData.filter(
-      (data: ConsoleData) => data.type === ConsoleDataType.Warning,
-    ).length;

    return (
      <div className="notificationConsoleContainer">
@@ -122,10 +118,6 @@ export class NotificationConsoleComponent extends React.Component<
                <img src={infoBubbleIcon} alt="Info items" />
                <span className="numInfoItems">{numInfoItems}</span>
              </span>
-              <span className="notificationConsoleHeaderIconWithData">
-                <img src={WarningIcon} alt="Warning items" />
-                <span className="numWarningItems">{numWarningItems}</span>
-              </span>
            </span>
            {userContext.features.pr && <PrPreview pr={userContext.features.pr} />}
            <span className="consoleSplitter" />
@@ -206,7 +198,6 @@ export class NotificationConsoleComponent extends React.Component<
        {item.type === ConsoleDataType.Info && <img className="infoIcon" src={InfoIcon} alt="info" />}
        {item.type === ConsoleDataType.Error && <img className="errorIcon" src={ErrorRedIcon} alt="error" />}
        {item.type === ConsoleDataType.InProgress && <img className="loaderIcon" src={LoaderIcon} alt="in progress" />}
-        {item.type === ConsoleDataType.Warning && <img className="warningIcon" src={WarningIcon} alt="warning" />}
        <span className="date">{item.date}</span>
        <span className="message" role="alert" aria-live="assertive">
          {item.message}
--- a/src/Explorer/Menus/NotificationConsole/snapshots/NotificationConsoleComponent.test.tsx.snap
+++ b/src/Explorer/Menus/NotificationConsole/snapshots/NotificationConsoleComponent.test.tsx.snap
@@ -59,19 +59,6 @@ exports[`NotificationConsoleComponent renders the console 1`] = `
            0
          </span>
        </span>
-        <span
-          className="notificationConsoleHeaderIconWithData"
-        >
-          <img
-            alt="Warning items"
-            src={{}}
-          />
-          <span
-            className="numWarningItems"
-          >
-            0
-          </span>
-        </span>
      </span>
      <span
        className="consoleSplitter"
@@ -242,19 +229,6 @@ exports[`NotificationConsoleComponent renders the console 2`] = `
            1
          </span>
        </span>
-        <span
-          className="notificationConsoleHeaderIconWithData"
-        >
-          <img
-            alt="Warning items"
-            src={{}}
-          />
-          <span
-            className="numWarningItems"
-          >
-            0
-          </span>
-        </span>
      </span>
      <span
        className="consoleSplitter"
--- a/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx
@@ -25,7 +25,7 @@ import { FullTextPoliciesComponent } from "Explorer/Controls/FullTextSeach/FullT
 import { VectorEmbeddingPoliciesComponent } from "Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent";
 import {
  AllPropertiesIndexed,
-  AnalyticalStoreHeader,
+  AnalyticalStorageContent,
  ContainerVectorPolicyTooltipContent,
  FullTextPolicyDefault,
  getPartitionKey,
@@ -49,7 +49,12 @@ import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
 import { getCollectionName } from "Utils/APITypeUtils";
-import { isCapabilityEnabled, isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
+import {
+  isCapabilityEnabled,
+  isFullTextSearchEnabled,
+  isServerlessAccount,
+  isVectorSearchEnabled,
+} from "Utils/CapabilityUtils";
 import { getUpsellMessage } from "Utils/PricingUtils";
 import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 import { CollapsibleSectionComponent } from "../../Controls/CollapsiblePanel/CollapsibleSectionComponent";
@@ -60,7 +65,6 @@ import { useDatabases } from "../../useDatabases";
 import { PanelFooterComponent } from "../PanelFooterComponent";
 import { PanelInfoErrorComponent } from "../PanelInfoErrorComponent";
 import { PanelLoadingScreen } from "../PanelLoadingScreen";
-import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";

 export interface AddCollectionPanelProps {
  explorer: Explorer;
@@ -106,7 +110,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
  private collectionThroughput: number;
  private isCollectionAutoscale: boolean;
  private isCostAcknowledged: boolean;
-  private showFullTextSearch: boolean;

  constructor(props: AddCollectionPanelProps) {
    super(props);
@@ -141,8 +144,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      fullTextIndexes: [],
      fullTextPolicyValidated: true,
    };
-
-    this.showFullTextSearch = userContext.apiType === "SQL";
  }

  componentDidMount(): void {
@@ -265,7 +266,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,

        <div className="panelMainContent">
          {!(isFabricNative() && this.props.databaseId !== undefined) && (
-            <Stack hidden={userContext.apiType === "Tables"} style={{ marginBottom: -2 }}>
+            <Stack hidden={userContext.apiType === "Tables"}>
              <Stack horizontal>
                <span className="mandatoryStar">*&nbsp;</span>
                <Text className="panelTextBold" variant="small">
@@ -407,12 +408,12 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                  responsiveMode={999}
                />
              )}
+              <Separator className="panelSeparator" />
            </Stack>
          )}
-          <Separator className="panelSeparator" style={{ marginTop: -4, marginBottom: -4 }} />

          <Stack>
-            <Stack horizontal style={{ marginTop: -5, marginBottom: 1 }}>
+            <Stack horizontal>
              <span className="mandatoryStar">*&nbsp;</span>
              <Text className="panelTextBold" variant="small">
                {`${getCollectionName()} id`}
@@ -450,10 +451,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
              }
            />
          </Stack>
-          <Separator className="panelSeparator" style={{ marginTop: -5, marginBottom: -5 }} />
+
          {this.shouldShowIndexingOptionsForFreeTierAccount() && (
            <Stack>
-              <Stack horizontal style={{ marginTop: -4, marginBottom: -5 }}>
+              <Stack horizontal>
                <span className="mandatoryStar">*&nbsp;</span>
                <Text className="panelTextBold" variant="small">
                  Indexing
@@ -499,7 +500,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
            (!this.state.isSharedThroughputChecked ||
              this.props.explorer.isFixedCollectionWithSharedThroughputSupported()) && (
              <Stack>
-                <Stack horizontal style={{ marginTop: -5, marginBottom: -4 }}>
+                <Stack horizontal>
                  <span className="mandatoryStar">*&nbsp;</span>
                  <Text className="panelTextBold" variant="small">
                    Sharding
@@ -555,7 +556,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,

          {this.state.isSharded && (
            <Stack>
-              <Stack horizontal style={{ marginTop: -5, marginBottom: -4 }}>
+              <Stack horizontal>
                <span className="mandatoryStar">*&nbsp;</span>
                <Text className="panelTextBold" variant="small">
                  {getPartitionKeyName()}
@@ -599,7 +600,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
              {userContext.apiType === "SQL" &&
                this.state.subPartitionKeys.map((subPartitionKey: string, index: number) => {
                  return (
-                    <Stack style={{ marginBottom: 2, marginTop: -5 }} key={`uniqueKey${index}`} horizontal>
+                    <Stack style={{ marginBottom: 8 }} key={`uniqueKey${index}`} horizontal>
                      <div
                        style={{
                          width: "20px",
@@ -667,7 +668,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                  )}
                </Stack>
              )}
-              <Separator className="panelSeparator" style={{ marginTop: 2, marginBottom: -4 }} />
            </Stack>
          )}

@@ -728,7 +728,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
          )}

          {!isFabricNative() && userContext.apiType === "SQL" && (
-            <Stack style={{ marginTop: -2, marginBottom: -4 }}>
+            <Stack>
              {UniqueKeysHeader()}
              {this.state.uniqueKeys.map((uniqueKey: string, i: number): JSX.Element => {
                return (
@@ -777,12 +777,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
            </Stack>
          )}

-          <Separator className="panelSeparator" style={{ marginTop: -15, marginBottom: -4 }} />
-
          {shouldShowAnalyticalStoreOptions() && (
-            <Stack className="panelGroupSpacing" style={{ marginTop: -4 }}>
+            <Stack className="panelGroupSpacing">
              <Text className="panelTextBold" variant="small">
-                {AnalyticalStoreHeader()}
+                {AnalyticalStorageContent()}
              </Text>

              <Stack horizontal verticalAlign="center">
@@ -823,7 +821,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                <Stack className="panelGroupSpacing">
                  <Text variant="small">
                    Azure Synapse Link is required for creating an analytical store{" "}
-                    {getCollectionName().toLocaleLowerCase()}. Enable Synapse Link for this Cosmos DB account. <br />
+                    {getCollectionName().toLocaleLowerCase()}. Enable Synapse Link for this Cosmos DB account.{" "}
                    <Link
                      href="https://aka.ms/cosmosdb-synapselink"
                      target="_blank"
@@ -1163,7 +1161,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
  }

  private shouldShowFullTextSearchParameters() {
-    return !isFabricNative() && this.showFullTextSearch;
+    return isFullTextSearchEnabled() && (isServerlessAccount() || this.shouldShowCollectionThroughputInput());
  }

  private parseUniqueKeys(): DataModels.UniqueKeyPolicy {
@@ -1318,7 +1316,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      };
    }

-    if (this.showFullTextSearch) {
+    if (this.shouldShowFullTextSearchParameters()) {
      indexingPolicy.fullTextIndexes = this.state.fullTextIndexes;
    }

@@ -1352,12 +1350,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
    let offerThroughput: number;
    let autoPilotMaxThroughput: number;

-    // Throughput
-    if (isFabricNative()) {
-      // Fabric Native accounts are always autoscale and have a fixed throughput of 1K
-      autoPilotMaxThroughput = AutoPilotUtils.autoPilotThroughput1K;
-      offerThroughput = undefined;
-    } else if (databaseLevelThroughput) {
+    if (databaseLevelThroughput) {
      if (this.state.createNewDatabase) {
        if (this.isNewDatabaseAutoscale) {
          autoPilotMaxThroughput = this.newDatabaseThroughput;
--- a/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility.tsx
@@ -73,7 +73,7 @@ export function UniqueKeysHeader(): JSX.Element {
    "Unique keys provide developers with the ability to add a layer of data integrity to their database. By creating a unique key policy when a container is created, you ensure the uniqueness of one or more values per partition key.";

  return (
-    <Stack horizontal style={{ marginBottom: -2 }}>
+    <Stack horizontal>
      <Text className="panelTextBold" variant="small">
        Unique keys
      </Text>
@@ -98,21 +98,6 @@ export function shouldShowAnalyticalStoreOptions(): boolean {
  }
 }

-export function AnalyticalStoreHeader(): JSX.Element {
-  const tooltipContent =
-    "Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads.";
-  return (
-    <Stack horizontal style={{ marginBottom: -2 }}>
-      <Text className="panelTextBold" variant="small">
-        Analytical Store
-      </Text>
-      <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={tooltipContent}>
-        <Icon iconName="Info" className="panelInfoIcon" tabIndex={0} ariaLabel={tooltipContent} />
-      </TooltipHost>
-    </Stack>
-  );
-}
-
 export function AnalyticalStorageContent(): JSX.Element {
  return (
    <Text variant="small">
--- a/src/Explorer/Panes/AddCollectionPanel/snapshots/AddCollectionPanel.test.tsx.snap
+++ b/src/Explorer/Panes/AddCollectionPanel/snapshots/AddCollectionPanel.test.tsx.snap
@@ -11,11 +11,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
  >
    <Stack
      hidden={false}
-      style={
-        {
-          "marginBottom": -2,
-        }
-      }
    >
      <Stack
        horizontal={true}
@@ -143,25 +138,13 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
          </StyledTooltipHostBase>
        </Stack>
      </Stack>
+      <Separator
+        className="panelSeparator"
+      />
    </Stack>
-    <Separator
-      className="panelSeparator"
-      style={
-        {
-          "marginBottom": -4,
-          "marginTop": -4,
-        }
-      }
-    />
    <Stack>
      <Stack
        horizontal={true}
-        style={
-          {
-            "marginBottom": 1,
-            "marginTop": -5,
-          }
-        }
      >
        <span
          className="mandatoryStar"
@@ -204,24 +187,9 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
        value=""
      />
    </Stack>
-    <Separator
-      className="panelSeparator"
-      style={
-        {
-          "marginBottom": -5,
-          "marginTop": -5,
-        }
-      }
-    />
    <Stack>
      <Stack
        horizontal={true}
-        style={
-          {
-            "marginBottom": -4,
-            "marginTop": -5,
-          }
-        }
      >
        <span
          className="mandatoryStar"
@@ -286,15 +254,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
          Add hierarchical partition key
        </CustomizedDefaultButton>
      </Stack>
-      <Separator
-        className="panelSeparator"
-        style={
-          {
-            "marginBottom": -4,
-            "marginTop": 2,
-          }
-        }
-      />
    </Stack>
    <ThroughputInput
      isDatabase={false}
@@ -304,21 +263,9 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
      setIsThroughputCapExceeded={[Function]}
      setThroughputValue={[Function]}
    />
-    <Stack
-      style={
-        {
-          "marginBottom": -4,
-          "marginTop": -2,
-        }
-      }
-    >
+    <Stack>
      <Stack
        horizontal={true}
-        style={
-          {
-            "marginBottom": -2,
-          }
-        }
      >
        <Text
          className="panelTextBold"
@@ -359,53 +306,26 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
        Add unique key
      </CustomizedActionButton>
    </Stack>
-    <Separator
-      className="panelSeparator"
-      style={
-        {
-          "marginBottom": -4,
-          "marginTop": -15,
-        }
-      }
-    />
    <Stack
      className="panelGroupSpacing"
-      style={
-        {
-          "marginTop": -4,
-        }
-      }
    >
      <Text
        className="panelTextBold"
        variant="small"
      >
-        <Stack
-          horizontal={true}
-          style={
-            {
-              "marginBottom": -2,
-            }
-          }
+        <Text
+          variant="small"
        >
-          <Text
-            className="panelTextBold"
-            variant="small"
+          Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads.
+           
+          <StyledLinkBase
+            aria-label="Learn more about analytical store."
+            href="https://aka.ms/analytical-store-overview"
+            target="_blank"
          >
-            Analytical Store
-          </Text>
-          <StyledTooltipHostBase
-            content="Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads."
-            directionalHint={4}
-          >
-            <Icon
-              ariaLabel="Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads."
-              className="panelInfoIcon"
-              iconName="Info"
-              tabIndex={0}
-            />
-          </StyledTooltipHostBase>
-        </Stack>
+            Learn more
+          </StyledLinkBase>
+        </Text>
      </Text>
      <Stack
        horizontal={true}
@@ -461,8 +381,8 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
          Azure Synapse Link is required for creating an analytical store
           
          container
-          . Enable Synapse Link for this Cosmos DB account. 
-          <br />
+          . Enable Synapse Link for this Cosmos DB account.
+           
          <StyledLinkBase
            aria-label="Learn more about Azure Synapse Link."
            className="capacitycalculator-link"
@@ -491,44 +411,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
        />
      </Stack>
    </Stack>
-    <Stack>
-      <CollapsibleSectionComponent
-        isExpandedByDefault={false}
-        onExpand={[Function]}
-        title="Container Full Text Search Policy"
-      >
-        <Stack
-          id="collapsibleFullTextPolicySectionContent"
-          styles={
-            {
-              "root": {
-                "position": "relative",
-              },
-            }
-          }
-        >
-          <Stack
-            styles={
-              {
-                "root": {
-                  "paddingLeft": 40,
-                },
-              }
-            }
-          >
-            <FullTextPoliciesComponent
-              fullTextPolicy={
-                {
-                  "defaultLanguage": "en-US",
-                  "fullTextPaths": [],
-                }
-              }
-              onFullTextPathChange={[Function]}
-            />
-          </Stack>
-        </Stack>
-      </CollapsibleSectionComponent>
-    </Stack>
    <CollapsibleSectionComponent
      isExpandedByDefault={false}
      onExpand={[Function]}
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
@@ -40,12 +40,12 @@ import { PanelInfoErrorComponent } from "Explorer/Panes/PanelInfoErrorComponent"
 import { PanelLoadingScreen } from "Explorer/Panes/PanelLoadingScreen";
 import { useDatabases } from "Explorer/useDatabases";
 import { useSidePanel } from "hooks/useSidePanel";
-import React, { MutableRefObject, useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { CollectionCreation } from "Shared/Constants";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
-import { isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
+import { isFullTextSearchEnabled, isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";

 export interface AddGlobalSecondaryIndexPanelProps {
@@ -75,8 +75,6 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
  const [showErrorDetails, setShowErrorDetails] = useState<boolean>();
  const [isExecuting, setIsExecuting] = useState<boolean>();

-  const showFullTextSearch: MutableRefObject<boolean> = useRef<boolean>(userContext.apiType === "SQL");
-
  useEffect(() => {
    const sourceContainerOptions: IDropdownOption[] = [];
    useDatabases.getState().databases.forEach((database: Database) => {
@@ -142,6 +140,10 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
    return isVectorSearchEnabled() && (isServerlessAccount() || showCollectionThroughputInput());
  };

+  const showFullTextSearchParameters = (): boolean => {
+    return isFullTextSearchEnabled() && (isServerlessAccount() || showCollectionThroughputInput());
+  };
+
  const getAnalyticalStorageTtl = (): number => {
    if (!isSynapseLinkEnabled()) {
      return undefined;
@@ -173,6 +175,11 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
      return false;
    }

+    if (globalSecondaryIndexThroughput > CollectionCreation.MaxRUPerPartition) {
+      setErrorMessage("Unsharded collections support up to 10,000 RUs");
+      return false;
+    }
+
    if (showVectorSearchParameters()) {
      if (!vectorPolicyValidated) {
        setErrorMessage("Please fix errors in container vector policy");
@@ -226,7 +233,7 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
      };
    }

-    if (showFullTextSearch) {
+    if (showFullTextSearchParameters()) {
      indexingPolicy.fullTextIndexes = fullTextIndexes;
    }

@@ -381,11 +388,10 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
                setVectorIndexingPolicy,
                vectorPolicyValidated,
                setVectorPolicyValidated,
-                isGlobalSecondaryIndex: true,
              }}
            />
          )}
-          {showFullTextSearch && (
+          {showFullTextSearchParameters() && (
            <FullTextSearchComponent
              {...{ fullTextPolicy, setFullTextPolicy, setFullTextIndexes, setFullTextPolicyValidated }}
            />
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/ThroughputComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/ThroughputComponent.tsx
@@ -47,7 +47,7 @@ export const ThroughputComponent = (props: ThroughputComponentProps): JSX.Elemen
        <ThroughputInput
          showFreeTierExceedThroughputTooltip={isFreeTierAccount() && !useDatabases.getState().isFirstResourceCreated()}
          isDatabase={false}
-          isSharded={true}
+          isSharded={false}
          isFreeTier={isFreeTierAccount()}
          isQuickstart={false}
          isGlobalSecondaryIndex={true}
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
@@ -14,7 +14,6 @@ export interface VectorSearchComponentProps {
  vectorIndexingPolicy: VectorIndex[];
  setVectorIndexingPolicy: React.Dispatch<React.SetStateAction<VectorIndex[]>>;
  setVectorPolicyValidated: React.Dispatch<React.SetStateAction<boolean>>;
-  isGlobalSecondaryIndex?: boolean;
 }

 export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.Element => {
@@ -24,7 +23,6 @@ export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.El
    vectorIndexingPolicy,
    setVectorIndexingPolicy,
    setVectorPolicyValidated,
-    isGlobalSecondaryIndex,
  } = props;

  return (
@@ -51,7 +49,6 @@ export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.El
                setVectorIndexingPolicy(vectorIndexingPolicy);
                setVectorPolicyValidated(vectorPolicyValidated);
              }}
-              isGlobalSecondaryIndex={isGlobalSecondaryIndex}
            />
          </Stack>
        </Stack>
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/snapshots/AddGlobalSecondaryIndexPanel.test.tsx.snap
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/snapshots/AddGlobalSecondaryIndexPanel.test.tsx.snap
@@ -172,17 +172,6 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
        }
        setEnableAnalyticalStore={[Function]}
      />
-      <FullTextSearchComponent
-        fullTextPolicy={
-          {
-            "defaultLanguage": "en-US",
-            "fullTextPaths": [],
-          }
-        }
-        setFullTextIndexes={[Function]}
-        setFullTextPolicy={[Function]}
-        setFullTextPolicyValidated={[Function]}
-      />
      <AdvancedComponent
        setSubPartitionKeys={[Function]}
        setUseHashV1={[Function]}
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -180,11 +180,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
      ? LocalStorageUtility.getEntryNumber(StorageKey.MaxWaitTimeInSeconds)
      : Constants.Queries.DefaultMaxWaitTimeInSeconds,
  );
-  const [queryControlEnabled, setQueryControlEnabled] = useState<boolean>(
-    LocalStorageUtility.hasItem(StorageKey.QueryControlEnabled)
-      ? LocalStorageUtility.getEntryString(StorageKey.QueryControlEnabled) === "true"
-      : false,
-  );
  const [maxDegreeOfParallelism, setMaxDegreeOfParallelism] = useState<number>(
    LocalStorageUtility.hasItem(StorageKey.MaxDegreeOfParellism)
      ? LocalStorageUtility.getEntryNumber(StorageKey.MaxDegreeOfParellism)
@@ -209,7 +204,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    !isEmulator;
  const shouldShowGraphAutoVizOption = userContext.apiType === "Gremlin" && !isEmulator;
  const shouldShowCrossPartitionOption = userContext.apiType !== "Gremlin" && !isEmulator;
-  const shouldShowEnhancedQueryControl = userContext.apiType === "SQL";
  const shouldShowParallelismOption = userContext.apiType !== "Gremlin" && !isEmulator;
  const showEnableEntraIdRbac =
    isDataplaneRbacSupported(userContext.apiType) &&
@@ -387,7 +381,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    LocalStorageUtility.setEntryNumber(StorageKey.MaxWaitTimeInSeconds, MaxWaitTimeInSeconds);
    LocalStorageUtility.setEntryString(StorageKey.ContainerPaginationEnabled, containerPaginationEnabled.toString());
    LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, crossPartitionQueryEnabled.toString());
-    LocalStorageUtility.setEntryString(StorageKey.QueryControlEnabled, queryControlEnabled.toString());
    LocalStorageUtility.setEntryNumber(StorageKey.MaxDegreeOfParellism, maxDegreeOfParallelism);
    LocalStorageUtility.setEntryString(StorageKey.PriorityLevel, priorityLevel.toString());
    LocalStorageUtility.setEntryString(StorageKey.CopilotSampleDBEnabled, copilotSampleDBEnabled.toString());
@@ -417,7 +410,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
      `Updated items per page setting to ${LocalStorageUtility.getEntryNumber(StorageKey.ActualItemPerPage)}`,
    );
    logConsoleInfo(`${crossPartitionQueryEnabled ? "Enabled" : "Disabled"} cross-partition query feed option`);
-    logConsoleInfo(`${queryControlEnabled ? "Enabled" : "Disabled"} query control option`);
    logConsoleInfo(
      `Updated the max degree of parallelism query feed option to ${LocalStorageUtility.getEntryNumber(
        StorageKey.MaxDegreeOfParellism,
@@ -616,7 +608,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    <RightPaneForm {...genericPaneProps}>
      <div className={`paneMainContent ${styles.container}`}>
        {!isFabricNative() && (
-          <Accordion className={`customAccordion ${styles.firstItem}`} collapsible>
+          <Accordion className={`customAccordion ${styles.firstItem}`}>
            {shouldShowQueryPageOptions && (
              <AccordionItem value="1">
                <AccordionHeader>
@@ -768,6 +760,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                    )}
                  </AccordionPanel>
                </AccordionItem>
+
                <AccordionItem value="5">
                  <AccordionHeader>
                    <div className={styles.header}>RU Limit</div>
@@ -950,38 +943,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                </AccordionPanel>
              </AccordionItem>
            )}
-            {shouldShowEnhancedQueryControl && (
-              <AccordionItem value="10">
-                <AccordionHeader>
-                  <div className={styles.header}>Enhanced query control</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      Query up to the max degree of parallelism.
-                      <a
-                        href="https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/performance-tips-query-sdk?tabs=v3&pivots=programming-language-nodejs#enhanced-query-control"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                      >
-                        {" "}
-                        Learn more{" "}
-                      </a>
-                    </div>
-                    <Checkbox
-                      styles={{
-                        label: { padding: 0 },
-                      }}
-                      className="padding"
-                      ariaLabel="EnableQueryControl"
-                      checked={queryControlEnabled}
-                      onChange={() => setQueryControlEnabled(!queryControlEnabled)}
-                      label="Enable query control"
-                    />
-                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
            {shouldShowParallelismOption && (
              <AccordionItem value="10">
                <AccordionHeader>
--- a/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
@@ -12,7 +12,6 @@ exports[`Settings Pane should render Default properly 1`] = `
  >
    <Accordion
      className="customAccordion ___1uf6361_0000000 fz7g6wx"
-      collapsible={true}
    >
      <AccordionItem
        value="1"
@@ -495,51 +494,6 @@ exports[`Settings Pane should render Default properly 1`] = `
          </div>
        </AccordionPanel>
      </AccordionItem>
-      <AccordionItem
-        value="10"
-      >
-        <AccordionHeader>
-          <div
-            className="___15c001r_0000000 fq02s40"
-          >
-            Enhanced query control
-          </div>
-        </AccordionHeader>
-        <AccordionPanel>
-          <div
-            className="___1dfa554_0000000 fo7qwa0"
-          >
-            <div
-              className="___10gar1i_0000000 f1fow5ox f1ugzwwg"
-            >
-              Query up to the max degree of parallelism.
-              <a
-                href="https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/performance-tips-query-sdk?tabs=v3&pivots=programming-language-nodejs#enhanced-query-control"
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                 
-                Learn more
-                 
-              </a>
-            </div>
-            <StyledCheckboxBase
-              ariaLabel="EnableQueryControl"
-              checked={false}
-              className="padding"
-              label="Enable query control"
-              onChange={[Function]}
-              styles={
-                {
-                  "label": {
-                    "padding": 0,
-                  },
-                }
-              }
-            />
-          </div>
-        </AccordionPanel>
-      </AccordionItem>
      <AccordionItem
        value="10"
      >
@@ -619,7 +573,6 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
  >
    <Accordion
      className="customAccordion ___1uf6361_0000000 fz7g6wx"
-      collapsible={true}
    >
      <AccordionItem
        value="7"
--- a/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
+++ b/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
@@ -356,7 +356,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
            value=""
          >
            <div
-              className="ms-TextField is-required root-116"
+              className="ms-TextField is-required root-110"
            >
              <div
                className="ms-TextField-wrapper"
@@ -647,7 +647,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                    }
                  >
                    <label
-                      className="ms-Label root-127"
+                      className="ms-Label root-121"
                      htmlFor="TextField0"
                      id="TextFieldLabel2"
                    >
@@ -656,13 +656,13 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                  </LabelBase>
                </StyledLabelBase>
                <div
-                  className="ms-TextField-fieldGroup fieldGroup-117"
+                  className="ms-TextField-fieldGroup fieldGroup-111"
                >
                  <input
                    aria-invalid={false}
                    aria-labelledby="TextFieldLabel2"
                    autoFocus={true}
-                    className="ms-TextField-field field-118"
+                    className="ms-TextField-field field-112"
                    id="TextField0"
                    name="collectionIdConfirmation"
                    onBlur={[Function]}
@@ -2464,7 +2464,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                      >
                        <button
                          aria-label="Create"
-                          className="ms-Button ms-Button--primary root-128"
+                          className="ms-Button ms-Button--primary root-122"
                          data-is-focusable={true}
                          data-test="Panel/OkButton"
                          id="sidePanelOkButton"
@@ -2477,14 +2477,14 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                          type="submit"
                        >
                          <span
-                            className="ms-Button-flexContainer flexContainer-129"
+                            className="ms-Button-flexContainer flexContainer-123"
                            data-automationid="splitbuttonprimary"
                          >
                            <span
-                              className="ms-Button-textContainer textContainer-130"
+                              className="ms-Button-textContainer textContainer-124"
                            >
                              <span
-                                className="ms-Button-label label-132"
+                                className="ms-Button-label label-126"
                                id="id__5"
                                key="id__5"
                              >
--- a/src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx
+++ b/src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx
@@ -2,13 +2,9 @@ import {
  DetailsList,
  DetailsListLayoutMode,
  DirectionalHint,
-  FontIcon,
  IColumn,
  SelectionMode,
  TooltipHost,
-  getTheme,
-  mergeStyles,
-  mergeStyleSets,
 } from "@fluentui/react";
 import { Upload } from "Common/Upload/Upload";
 import { UploadDetailsRecord } from "Contracts/ViewModels";
@@ -18,41 +14,7 @@ import { getErrorMessage } from "../../Tables/Utilities";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";

-const theme = getTheme();
-const iconClass = mergeStyles({
-  verticalAlign: "middle",
-  maxHeight: "16px",
-  maxWidth: "16px",
-});
-
-const classNames = mergeStyleSets({
-  fileIconHeaderIcon: {
-    padding: 0,
-    fontSize: "16px",
-  },
-  fileIconCell: {
-    textAlign: "center",
-    selectors: {
-      "&:before": {
-        content: ".",
-        display: "inline-block",
-        verticalAlign: "middle",
-        height: "100%",
-        width: "0px",
-        visibility: "hidden",
-      },
-    },
-  },
-  error: [{ color: theme.semanticColors.errorIcon }, iconClass],
-  accept: [{ color: theme.semanticColors.successIcon }, iconClass],
-  warning: [{ color: theme.semanticColors.warningIcon }, iconClass],
-});
-
-export type UploadItemsPaneProps = {
-  onUpload?: (data: UploadDetailsRecord[]) => void;
-};
-
-export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpload }) => {
+export const UploadItemsPane: FunctionComponent = () => {
  const [files, setFiles] = useState<FileList>();
  const [uploadFileData, setUploadFileData] = useState<UploadDetailsRecord[]>([]);
  const [formError, setFormError] = useState<string>("");
@@ -75,8 +37,6 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
        (uploadDetails) => {
          setUploadFileData(uploadDetails.data);
          setFiles(undefined);
-          // Emit the upload details to the parent component
-          onUpload && onUpload(uploadDetails.data);
        },
        (error: Error) => {
          const errorMessage = getErrorMessage(error);
@@ -100,94 +60,44 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
  };

  const columns: IColumn[] = [
-    {
-      key: "icons",
-      name: "",
-      fieldName: "",
-      className: classNames.fileIconCell,
-      iconClassName: classNames.fileIconHeaderIcon,
-      isIconOnly: true,
-      minWidth: 16,
-      maxWidth: 16,
-      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
-        if (item.numFailed) {
-          const errorList = (
-            <ul
-              aria-label={"error list"}
-              style={{
-                margin: "5px 0",
-                paddingLeft: "20px",
-                listStyleType: "disc", // Explicitly set to use bullets (dots)
-              }}
-            >
-              {item.errors.map((error, i) => (
-                <li key={i} style={{ display: "list-item" }}>
-                  {error}
-                </li>
-              ))}
-            </ul>
-          );
-
-          return (
-            <TooltipHost
-              content={errorList}
-              id={`tooltip-${index}-${column.key}`}
-              directionalHint={DirectionalHint.bottomAutoEdge}
-            >
-              <FontIcon iconName="Error" className={classNames.error} aria-label="error" />
-            </TooltipHost>
-          );
-        } else if (item.numThrottled) {
-          return <FontIcon iconName="Warning" className={classNames.warning} aria-label="warning" />;
-        } else {
-          return <FontIcon iconName="Accept" className={classNames.accept} aria-label="accept" />;
-        }
-      },
-    },
    {
      key: "fileName",
      name: "FILE NAME",
      fieldName: "fileName",
-      minWidth: 120,
+      minWidth: 140,
      maxWidth: 140,
-      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
-        const fieldContent = item.fileName;
-        return (
-          <TooltipHost
-            content={fieldContent}
-            id={`tooltip-${index}-${column.key}`}
-            directionalHint={DirectionalHint.bottomAutoEdge}
-          >
-            {fieldContent}
-          </TooltipHost>
-        );
-      },
    },
    {
      key: "status",
      name: "STATUS",
      fieldName: "numSucceeded",
-      minWidth: 120,
+      minWidth: 140,
      maxWidth: 140,
      isRowHeader: true,
      isResizable: true,
      data: "string",
      isPadded: true,
-      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
-        const fieldContent = `${item.numSucceeded} created, ${item.numThrottled} throttled, ${item.numFailed} errors`;
-        return (
-          <TooltipHost
-            content={fieldContent}
-            id={`tooltip-${index}-${column.key}`}
-            directionalHint={DirectionalHint.bottomAutoEdge}
-          >
-            {fieldContent}
-          </TooltipHost>
-        );
-      },
    },
  ];

+  const _renderItemColumn = (item: UploadDetailsRecord, index: number, column: IColumn) => {
+    let fieldContent: string;
+    const tooltipId = `tooltip-${index}-${column.key}`;
+
+    switch (column.key) {
+      case "status":
+        fieldContent = `${item.numSucceeded} created, ${item.numThrottled} throttled, ${item.numFailed} errors`;
+        break;
+      default:
+        fieldContent = item.fileName;
+    }
+    return (
+      <TooltipHost content={fieldContent} id={tooltipId} directionalHint={DirectionalHint.rightCenter}>
+        {fieldContent}
+      </TooltipHost>
+    );
+  };
+
  return (
    <RightPaneForm {...props}>
      <div className="paneMainContent">
@@ -205,6 +115,7 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
            <DetailsList
              items={uploadFileData}
              columns={columns}
+              onRenderItemColumn={_renderItemColumn}
              selectionMode={SelectionMode.none}
              layoutMode={DetailsListLayoutMode.justified}
              isHeaderVisible={true}
--- a/src/Explorer/Sidebar.tsx
+++ b/src/Explorer/Sidebar.tsx
@@ -27,13 +27,11 @@ import { CosmosFluentProvider, cosmosShorthands, tokens } from "Explorer/Theme/T
 import { ResourceTree } from "Explorer/Tree/ResourceTree";
 import { useDatabases } from "Explorer/useDatabases";
 import { KeyboardAction, KeyboardActionGroup, KeyboardActionHandler, useKeyboardActionGroup } from "KeyboardShortcuts";
-import { isFabric, isFabricMirrored, isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
+import { isFabric, isFabricMirrored, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { userContext } from "UserContext";
 import { getCollectionName, getDatabaseName } from "Utils/APITypeUtils";
-import { conditionalClass } from "Utils/StyleUtils";
 import { Allotment, AllotmentHandle } from "allotment";
 import { useSidePanel } from "hooks/useSidePanel";
-import useZoomLevel from "hooks/useZoomLevel";
 import { debounce } from "lodash";
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

@@ -106,23 +104,6 @@ const useSidebarStyles = makeStyles({
      display: "flex",
    },
  },
-  accessibleContent: {
-    "@media (max-width: 420px)": {
-      overflow: "scroll",
-    },
-  },
-  minHeightResponsive: {
-    "@media (max-width: 420px)": {
-      minHeight: "400px",
-    },
-  },
-  accessibleContentZoom: {
-    overflow: "scroll",
-  },
-
-  minHeightZoom: {
-    minHeight: "400px",
-  },
 });

 interface GlobalCommandsProps {
@@ -294,7 +275,6 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
  const [expandedSize, setExpandedSize] = React.useState(300);
  const hasSidebar = userContext.apiType !== "Postgres" && userContext.apiType !== "VCoreMongo";
  const allotment = useRef<AllotmentHandle>(null);
-  const isZoomed = useZoomLevel();

  const expand = useCallback(() => {
    if (!expanded) {
@@ -338,30 +318,17 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {

  const hasGlobalCommands = !(
    isFabricMirrored() ||
-    isFabricNativeReadOnly() ||
    userContext.apiType === "Postgres" ||
    userContext.apiType === "VCoreMongo"
  );

  return (
    <div className="sidebarContainer">
-      <Allotment
-        ref={allotment}
-        onChange={onChange}
-        onDragEnd={onDragEnd}
-        className={`resourceTreeAndTabs ${styles.accessibleContent} ${conditionalClass(
-          isZoomed,
-          styles.accessibleContentZoom,
-        )}`}
-      >
+      <Allotment ref={allotment} onChange={onChange} onDragEnd={onDragEnd} className="resourceTreeAndTabs">
        {/* Collections Tree - Start */}
        {hasSidebar && (
          // When collapsed, we force the pane to 24 pixels wide and make it non-resizable.
-          <Allotment.Pane
-            className={`${styles.minHeightResponsive} ${conditionalClass(isZoomed, styles.minHeightZoom)}`}
-            minSize={24}
-            preferredSize={250}
-          >
+          <Allotment.Pane minSize={24} preferredSize={250}>
            <CosmosFluentProvider className={mergeClasses(styles.sidebar)}>
              <div className={styles.sidebarContainer}>
                {loading && (
@@ -417,10 +384,7 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
            </CosmosFluentProvider>
          </Allotment.Pane>
        )}
-        <Allotment.Pane
-          className={`${styles.minHeightResponsive} ${conditionalClass(isZoomed, styles.minHeightZoom)}`}
-          minSize={200}
-        >
+        <Allotment.Pane minSize={200}>
          <Tabs explorer={explorer} />
        </Allotment.Pane>
      </Allotment>
--- a/src/Explorer/SplashScreen/FabricHome.tsx
+++ b/src/Explorer/SplashScreen/FabricHome.tsx
@@ -1,14 +1,15 @@
 /**
 * Accordion top class
 */
-import { makeStyles, tokens } from "@fluentui/react-components";
+import { Link, makeStyles, tokens } from "@fluentui/react-components";
 import { DocumentAddRegular, LinkMultipleRegular } from "@fluentui/react-icons";
 import { SampleDataImportDialog } from "Explorer/SplashScreen/SampleDataImportDialog";
 import { CosmosFluentProvider } from "Explorer/Theme/ThemeUtil";
-import { isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import * as React from "react";
 import { userContext } from "UserContext";
 import CosmosDbBlackIcon from "../../../images/CosmosDB_black.svg";
+import LinkIcon from "../../../images/Link_blue.svg";
 import Explorer from "../Explorer";

 export interface SplashScreenProps {
@@ -61,15 +62,6 @@ const useStyles = makeStyles({
      margin: "auto",
    },
  },
-  single: {
-    gridColumn: "1 / 4",
-    gridRow: "1 / 3",
-    "& svg": {
-      width: "64px",
-      height: "64px",
-      margin: "auto",
-    },
-  },
  buttonContainer: {
    height: "100%",
    display: "flex",
@@ -158,11 +150,7 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
      },
    ];

-    return isFabricNativeReadOnly() ? (
-      <div className={styles.buttonsContainer}>
-        <FabricHomeScreenButton className={styles.single} {...buttons[2]} />
-      </div>
-    ) : (
+    return (
      <div className={styles.buttonsContainer}>
        <FabricHomeScreenButton className={styles.one} {...buttons[0]} />
        <FabricHomeScreenButton className={styles.two} {...buttons[1]} />
@@ -171,7 +159,7 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
    );
  };

-  const title = isFabricNativeReadOnly() ? "Use your database" : "Build your database";
+  const title = "Build your database";
  return (
    <>
      <CosmosFluentProvider className={styles.homeContainer}>
@@ -185,12 +173,12 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
          {title}
        </div>
        {getSplashScreenButtons()}
-        {/* <div className={styles.footer}>
+        <div className={styles.footer}>
          Need help?{" "}
          <Link href="https://aka.ms/cosmosdbfabricdocs" target="_blank">
            Learn more <img src={LinkIcon} alt="Learn more" />
          </Link>
-        </div> */}
+        </div>
      </CosmosFluentProvider>
    </>
  );
--- a/src/Explorer/SplashScreen/SplashScreen.less
+++ b/src/Explorer/SplashScreen/SplashScreen.less
@@ -30,21 +30,6 @@
      margin: 0px auto;
      text-align: center;
    }
-    .splashStackContainer {
-      .splashStackRow {
-        display: flex;
-        gap: 0 16px;
-
-        @media (max-width: 768px) {
-          flex-direction: column;
-          gap: 16px 0;
-        }
-      }
-
-      @media (max-width: 768px) {
-        width: 85% !important;
-      }
-    }

    .mainButtonsContainer {
      .flex-display();
--- a/src/Explorer/SplashScreen/SplashScreen.tsx
+++ b/src/Explorer/SplashScreen/SplashScreen.tsx
@@ -28,7 +28,6 @@ import LinkIcon from "../../../images/Link_blue.svg";
 import PowerShellIcon from "../../../images/PowerShell.svg";
 import CopilotIcon from "../../../images/QueryCopilotNewLogo.svg";
 import QuickStartIcon from "../../../images/Quickstart_Lightning.svg";
-import VisualStudioIcon from "../../../images/VisualStudio.svg";
 import NotebookIcon from "../../../images/notebook/Notebook-resource.svg";
 import CollectionIcon from "../../../images/tree-collection.svg";
 import * as Constants from "../../Common/Constants";
@@ -126,12 +125,8 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
      useDatabases.getState().sampleDataResourceTokenCollection
    ) {
      return (
-        <Stack
-          className="splashStackContainer"
-          style={{ width: "66%", cursor: "pointer", margin: "40px auto" }}
-          tokens={{ childrenGap: 16 }}
-        >
-          <Stack className="splashStackRow" horizontal>
+        <Stack style={{ width: "66%", cursor: "pointer", margin: "40px auto" }} tokens={{ childrenGap: 16 }}>
+          <Stack horizontal tokens={{ childrenGap: 16 }}>
            <SplashScreenButton
              imgSrc={QuickStartIcon}
              title={"Launch quick start"}
@@ -151,7 +146,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
              }}
            />
          </Stack>
-          <Stack className="splashStackRow" horizontal>
+          <Stack horizontal tokens={{ childrenGap: 16 }}>
            {useQueryCopilot.getState().copilotEnabled && (
              <SplashScreenButton
                imgSrc={CopilotIcon}
@@ -295,10 +290,10 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
        <form className="connectExplorerFormContainer">
          <div className="splashScreenContainer">
            <div className="splashScreen">
-              <h2 className="title" role="heading" aria-label={title}>
+              <h1 className="title" role="heading" aria-label={title}>
                {title}
                <FeaturePanelLauncher />
-              </h2>
+              </h1>
              <div className="subtitle">{subtitle}</div>
              {this.getSplashScreenButtons()}
              {useCarousel.getState().showCoachMark && (
@@ -463,10 +458,10 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
    }

    if (userContext.apiType === "VCoreMongo") {
-      icon = VisualStudioIcon;
-      title = "Connect with VS Code";
-      description = "Query and Manage your MongoDB cluster in Visual Studio Code";
-      onClick = () => this.container.openInVsCode();
+      icon = ContainersIcon;
+      title = "Connect with Studio 3T";
+      description = "Prefer Studio 3T? Find your connection strings here";
+      onClick = () => useTabs.getState().openAndActivateReactTab(ReactTabKind.Connect);
    }

    return {
--- a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalComponent.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalComponent.tsx
@@ -1,80 +0,0 @@
-import { FitAddon } from "@xterm/addon-fit";
-import { Terminal } from "@xterm/xterm";
-import React, { useEffect, useRef } from "react";
-import "xterm/css/xterm.css";
-import { DatabaseAccount } from "../../../Contracts/DataModels";
-import { TerminalKind } from "../../../Contracts/ViewModels";
-import { startCloudShellTerminal } from "./CloudShellTerminalCore";
-
-export interface CloudShellTerminalComponentProps {
-  databaseAccount: DatabaseAccount;
-  tabId: string;
-  username?: string;
-  shellType?: TerminalKind;
-}
-
-export const CloudShellTerminalComponent: React.FC<CloudShellTerminalComponentProps> = (props) => {
-  const terminalRef = useRef(null); // Reference for terminal container
-  const xtermRef = useRef(null); // Reference for XTerm instance
-  const socketRef = useRef(null); // Reference for WebSocket
-
-  useEffect(() => {
-    // Initialize XTerm instance
-    const terminal = new Terminal({
-      cursorBlink: true,
-      cursorStyle: "bar",
-      fontFamily: "monospace",
-      fontSize: 11,
-      theme: {
-        background: "#1e1e1e",
-        foreground: "#d4d4d4",
-        cursor: "#ffcc00",
-      },
-      scrollback: 1000,
-    });
-
-    const fitAddon = new FitAddon();
-    terminal.loadAddon(fitAddon);
-    // Attach terminal to the DOM
-    if (terminalRef.current) {
-      terminal.open(terminalRef.current);
-      xtermRef.current = terminal;
-    }
-
-    // Defer terminal sizing until after DOM rendering is complete
-    setTimeout(() => {
-      fitAddon.fit();
-    }, 0);
-
-    // Use ResizeObserver instead of window resize
-    const resizeObserver = new ResizeObserver(() => {
-      const container = terminalRef.current;
-      if (container && container.offsetWidth > 0 && container.offsetHeight > 0) {
-        try {
-          fitAddon.fit();
-        } catch (e) {
-          console.warn("Fit failed on resize:", e);
-        }
-      }
-    });
-    resizeObserver.observe(terminalRef.current);
-
-    socketRef.current = startCloudShellTerminal(terminal, props.shellType);
-
-    // Cleanup function to close WebSocket and dispose terminal
-    return () => {
-      if (!socketRef.current) {
-        return;
-      }
-      if (socketRef.current && socketRef.current.readyState && socketRef.current.readyState === WebSocket.OPEN) {
-        socketRef.current.close(); // Close WebSocket connection
-      }
-      if (resizeObserver && terminalRef.current) {
-        resizeObserver.unobserve(terminalRef.current);
-      }
-      terminal.dispose(); // Clean up XTerm instance
-    };
-  }, []);
-
-  return <div ref={terminalRef} style={{ width: "100%", height: "500px" }} />;
-};
--- a/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx
@@ -1,309 +0,0 @@
-import { Terminal } from "@xterm/xterm";
-import { Areas } from "../../../Common/Constants";
-import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
-import { TerminalKind } from "../../../Contracts/ViewModels";
-import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
-import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-import { userContext } from "../../../UserContext";
-import {
-  connectTerminal,
-  provisionConsole,
-  putEphemeralUserSettings,
-  registerCloudShellProvider,
-  verifyCloudShellProviderRegistration,
-} from "./Data/CloudShellClient";
-import { CloudShellProviderInfo, ProvisionConsoleResponse } from "./Models/DataModels";
-import { AbstractShellHandler, START_MARKER } from "./ShellTypes/AbstractShellHandler";
-import { getHandler } from "./ShellTypes/ShellTypeFactory";
-import { AttachAddon } from "./Utils/AttachAddOn";
-import { askConfirmation, wait } from "./Utils/CommonUtils";
-import { getNormalizedRegion } from "./Utils/RegionUtils";
-import { formatErrorMessage, formatInfoMessage, formatWarningMessage } from "./Utils/TerminalLogFormats";
-
-// Constants
-const DEFAULT_CLOUDSHELL_REGION = "westus";
-const POLLING_INTERVAL_MS = 2000;
-const MAX_RETRY_COUNT = 10;
-const MAX_PING_COUNT = 120 * 60; // 120 minutes (60 seconds/minute)
-
-let pingCount = 0;
-let keepAliveID: NodeJS.Timeout = null;
-
-/**
- * Main function to start a CloudShell terminal
- */
-export const startCloudShellTerminal = async (terminal: Terminal, shellType: TerminalKind): Promise<WebSocket> => {
-  const startKey = TelemetryProcessor.traceStart(Action.CloudShellTerminalSession, {
-    shellType: TerminalKind[shellType],
-    dataExplorerArea: Areas.CloudShell,
-  });
-
-  let resolvedRegion: string;
-  try {
-    await ensureCloudShellProviderRegistered();
-
-    resolvedRegion = determineCloudShellRegion();
-
-    resolvedRegion = determineCloudShellRegion();
-
-    terminal.writeln(formatWarningMessage("⚠️  IMPORTANT: Azure Cloud Shell Region Notice ⚠️"));
-    terminal.writeln(
-      formatInfoMessage(
-        "The Cloud Shell environment will operate in a region that may differ from your database's region.",
-      ),
-    );
-    terminal.writeln(formatInfoMessage("This has two potential implications:"));
-    terminal.writeln(formatInfoMessage("1. Performance Impact:"));
-    terminal.writeln(
-      formatInfoMessage("   Commands may experience higher latency due to geographic distance between regions."),
-    );
-    terminal.writeln(formatInfoMessage("2. Data Compliance Considerations:"));
-    terminal.writeln(
-      formatInfoMessage(
-        "   Data processed through this shell could temporarily reside in a different geographic region,",
-      ),
-    );
-    terminal.writeln(
-      formatInfoMessage("   which may affect compliance with data residency requirements or regulations specific"),
-    );
-    terminal.writeln(formatInfoMessage("   to your organization."));
-    terminal.writeln("");
-
-    terminal.writeln("\x1b[94mFor more information on Azure Cosmos DB data governance and compliance, please visit:");
-    terminal.writeln("\x1b[94mhttps://learn.microsoft.com/en-us/azure/cosmos-db/data-residency\x1b[0m");
-
-    // Ask for user consent for region
-    const consentGranted = await askConfirmation(terminal, formatWarningMessage("Do you wish to proceed?"));
-
-    // Track user decision
-    TelemetryProcessor.trace(
-      Action.CloudShellUserConsent,
-      consentGranted ? ActionModifiers.Success : ActionModifiers.Cancel,
-      {
-        dataExplorerArea: Areas.CloudShell,
-        shellType: TerminalKind[shellType],
-        isConsent: consentGranted,
-        region: resolvedRegion,
-      },
-      startKey,
-    );
-
-    if (!consentGranted) {
-      terminal.writeln(
-        formatErrorMessage("Session ended. Please close this tab and initiate a new shell session if needed."),
-      );
-      return null; // Exit if user declined
-    }
-
-    terminal.writeln(formatInfoMessage("Connecting to CloudShell. This may take a moment. Please wait..."));
-
-    const sessionDetails: {
-      socketUri?: string;
-      provisionConsoleResponse?: ProvisionConsoleResponse;
-      targetUri?: string;
-    } = await provisionCloudShellSession(resolvedRegion, terminal);
-
-    if (!sessionDetails.socketUri) {
-      terminal.writeln(formatErrorMessage("Failed to establish a connection. Please try again later."));
-      return null;
-    }
-
-    // Get the shell handler for this type
-    const shellHandler = await getHandler(shellType);
-    // Configure WebSocket connection with shell-specific commands
-    const socket = await establishTerminalConnection(terminal, shellHandler, sessionDetails.socketUri);
-
-    TelemetryProcessor.traceSuccess(
-      Action.CloudShellTerminalSession,
-      {
-        shellType: TerminalKind[shellType],
-        dataExplorerArea: Areas.CloudShell,
-        region: resolvedRegion,
-        socketUri: sessionDetails.socketUri,
-      },
-      startKey,
-    );
-
-    return socket;
-  } catch (err) {
-    TelemetryProcessor.traceFailure(
-      Action.CloudShellTerminalSession,
-      {
-        shellType: TerminalKind[shellType],
-        dataExplorerArea: Areas.CloudShell,
-        region: resolvedRegion,
-        error: getErrorMessage(err),
-        errorStack: getErrorStack(err),
-      },
-      startKey,
-    );
-
-    terminal.writeln(formatErrorMessage(`Failed with error.${getErrorMessage(err)}`));
-
-    return null;
-  }
-};
-
-/**
- * Ensures that the CloudShell provider is registered for the current subscription
- */
-export const ensureCloudShellProviderRegistered = async (): Promise<void> => {
-  const response: CloudShellProviderInfo = await verifyCloudShellProviderRegistration(userContext.subscriptionId);
-
-  if (response.registrationState !== "Registered") {
-    await registerCloudShellProvider(userContext.subscriptionId);
-  }
-};
-
-/**
- * Determines the appropriate CloudShell region
- */
-export const determineCloudShellRegion = (): string => {
-  return getNormalizedRegion(userContext.databaseAccount?.location, DEFAULT_CLOUDSHELL_REGION);
-};
-
-/**
- * Provisions a CloudShell session
- */
-export const provisionCloudShellSession = async (
-  resolvedRegion: string,
-  terminal: Terminal,
-): Promise<{ socketUri?: string; provisionConsoleResponse?: ProvisionConsoleResponse; targetUri?: string }> => {
-  // Apply user settings
-  await putEphemeralUserSettings(userContext.subscriptionId, resolvedRegion);
-
-  // Provision console
-  let provisionConsoleResponse;
-  let attemptCounter = 0;
-
-  do {
-    provisionConsoleResponse = await provisionConsole(resolvedRegion);
-    attemptCounter++;
-
-    if (provisionConsoleResponse.properties.provisioningState === "Failed") {
-      break;
-    }
-
-    if (provisionConsoleResponse.properties.provisioningState !== "Succeeded") {
-      await wait(POLLING_INTERVAL_MS);
-    }
-  } while (provisionConsoleResponse.properties.provisioningState !== "Succeeded" && attemptCounter < MAX_RETRY_COUNT);
-
-  if (provisionConsoleResponse.properties.provisioningState !== "Succeeded") {
-    throw new Error(`Provisioning failed: ${provisionConsoleResponse.properties.provisioningState}`);
-  }
-
-  // Connect terminal
-  const connectTerminalResponse = await connectTerminal(provisionConsoleResponse.properties.uri, {
-    rows: terminal.rows,
-    cols: terminal.cols,
-  });
-
-  const targetUri = `${provisionConsoleResponse.properties.uri}/terminals?cols=${terminal.cols}&rows=${terminal.rows}&version=2019-01-01&shell=bash`;
-  const termId = connectTerminalResponse.id;
-
-  // Determine socket URI
-  let socketUri = connectTerminalResponse.socketUri.replace(":443/", "");
-  const targetUriBody = targetUri.replace("https://", "").split("?")[0];
-
-  // This socket URI transformation logic handles different Azure service endpoint formats.
-  // If the returned socketUri doesn't contain the expected host, we construct it manually.
-  // This ensures compatibility across different Azure regions and deployment configurations.
-  if (socketUri.indexOf(targetUriBody) === -1) {
-    socketUri = `wss://${targetUriBody}/${termId}`;
-  }
-
-  // Special handling for ServiceBus-based endpoints which require a specific URI format
-  // with the hierarchical connection ($hc) path segment for terminal connections
-  if (targetUriBody.includes("servicebus")) {
-    const targetUriBodyArr = targetUriBody.split("/");
-    socketUri = `wss://${targetUriBodyArr[0]}/$hc/${targetUriBodyArr[1]}/terminals/${termId}`;
-  }
-
-  return { socketUri, provisionConsoleResponse, targetUri };
-};
-
-/**
- * Establishes a terminal connection via WebSocket
- */
-export const establishTerminalConnection = async (
-  terminal: Terminal,
-  shellHandler: AbstractShellHandler,
-  socketUri: string,
-): Promise<WebSocket> => {
-  let socket = new WebSocket(socketUri);
-
-  // Get shell-specific initial commands
-  const initCommands = shellHandler.getInitialCommands();
-
-  // Configure the socket
-  socket = await configureSocketConnection(socket, socketUri, terminal, initCommands, 0);
-
-  const options = {
-    startMarker: START_MARKER,
-    shellHandler: shellHandler,
-  };
-
-  // Attach the terminal addon
-  const attachAddon = new AttachAddon(socket, options);
-  terminal.loadAddon(attachAddon);
-
-  return socket;
-};
-
-/**
- * Configures a WebSocket connection for the terminal
- */
-export const configureSocketConnection = async (
-  socket: WebSocket,
-  uri: string,
-  terminal: Terminal,
-  initCommands: string,
-  socketRetryCount: number,
-): Promise<WebSocket> => {
-  sendTerminalStartupCommands(socket, initCommands);
-
-  socket.onerror = async () => {
-    if (socketRetryCount < MAX_RETRY_COUNT && socket.readyState !== WebSocket.CLOSED) {
-      await configureSocketConnection(socket, uri, terminal, initCommands, socketRetryCount + 1);
-    } else {
-      socket.close();
-    }
-  };
-
-  socket.onclose = () => {
-    if (keepAliveID) {
-      clearTimeout(keepAliveID);
-      pingCount = 0;
-    }
-  };
-
-  return socket;
-};
-
-export const sendTerminalStartupCommands = (socket: WebSocket, initCommands: string): void => {
-  // ensures connections don't remain open indefinitely by implementing an automatic timeout after 120 minutes.
-  const keepSocketAlive = (socket: WebSocket) => {
-    if (socket.readyState === WebSocket.OPEN) {
-      if (pingCount >= MAX_PING_COUNT) {
-        socket.close();
-      } else {
-        pingCount++;
-        // The code uses a recursive setTimeout pattern rather than setInterval,
-        // which ensures each new ping only happens after the previous one completes
-        // and naturally stops if the socket closes.
-        keepAliveID = setTimeout(() => keepSocketAlive(socket), 1000);
-      }
-    }
-  };
-
-  if (socket && socket.readyState === WebSocket.OPEN) {
-    socket.send(initCommands);
-    keepSocketAlive(socket);
-  } else {
-    socket.onopen = () => {
-      socket.send(initCommands);
-      keepSocketAlive(socket);
-    };
-  }
-};
--- a/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.test.tsx
@@ -1,337 +0,0 @@
-import { armRequest } from "../../../../Utils/arm/request";
-import { NetworkType, OsType, SessionType, ShellType } from "../Models/DataModels";
-import {
-  connectTerminal,
-  getUserSettings,
-  provisionConsole,
-  putEphemeralUserSettings,
-  registerCloudShellProvider,
-  verifyCloudShellProviderRegistration,
-} from "./CloudShellClient";
-
-// Instead of redeclaring fetch, modify the global context
-/* eslint-disable @typescript-eslint/no-namespace */
-declare global {
-  namespace NodeJS {
-    interface Global {
-      fetch: jest.Mock;
-    }
-  }
-}
-/* eslint-enable @typescript-eslint/no-namespace */
-
-// Define mock endpoint
-const MOCK_ARM_ENDPOINT = "https://mock-management.azure.com";
-
-// Mock dependencies
-jest.mock("uuid", () => ({
-  v4: jest.fn().mockReturnValue("mocked-uuid"),
-}));
-
-jest.mock("../../../../ConfigContext", () => ({
-  configContext: {
-    ARM_ENDPOINT: "https://mock-management.azure.com",
-  },
-}));
-
-jest.mock("../../../../UserContext", () => ({
-  userContext: {
-    authorizationToken: "Bearer mock-token",
-  },
-}));
-
-jest.mock("../../../../Utils/arm/request");
-
-jest.mock("../Utils/CommonUtils", () => ({
-  getLocale: jest.fn().mockReturnValue("en-US"),
-}));
-
-// Properly mock fetch with correct typings
-const mockJsonPromise = jest.fn();
-global.fetch = jest.fn().mockImplementationOnce(() => {
-  return {
-    ok: true,
-    status: 200,
-    json: mockJsonPromise,
-    text: jest.fn().mockResolvedValue(""),
-    headers: new Headers(),
-  } as unknown as Promise<Response>;
-}) as jest.Mock;
-
-describe("CloudShellClient", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockJsonPromise.mockClear();
-  });
-
-  // Reset all mocks after all tests
-  afterAll(() => {
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    if (global.fetch) {
-      delete global.fetch;
-    }
-  });
-
-  describe("getUserSettings", () => {
-    it("should call armRequest with correct parameters and return settings", async () => {
-      const mockSettings = { properties: { preferredLocation: "eastus" } };
-      (armRequest as jest.Mock).mockResolvedValueOnce(mockSettings);
-
-      const result = await getUserSettings();
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "/providers/Microsoft.Portal/userSettings/cloudconsole",
-        method: "GET",
-        apiVersion: "2023-02-01-preview",
-      });
-      expect(result).toEqual(mockSettings);
-    });
-
-    it("should handle errors when settings retrieval fails", async () => {
-      const mockError = new Error("Failed to get user settings");
-      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
-
-      await expect(getUserSettings()).rejects.toThrow("Failed to get user settings");
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "/providers/Microsoft.Portal/userSettings/cloudconsole",
-        method: "GET",
-        apiVersion: "2023-02-01-preview",
-      });
-    });
-  });
-
-  describe("putEphemeralUserSettings", () => {
-    it("should call armRequest with default network settings", async () => {
-      const mockResponse = { id: "settings-id" };
-      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
-
-      const result = await putEphemeralUserSettings("sub-id", "eastus");
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "/providers/Microsoft.Portal/userSettings/cloudconsole",
-        method: "PUT",
-        apiVersion: "2023-02-01-preview",
-        body: {
-          properties: {
-            preferredOsType: OsType.Linux,
-            preferredShellType: ShellType.Bash,
-            preferredLocation: "eastus",
-            networkType: NetworkType.Default,
-            sessionType: SessionType.Ephemeral,
-            userSubscription: "sub-id",
-            vnetSettings: {},
-          },
-        },
-      });
-      expect(result).toEqual(mockResponse);
-    });
-
-    it("should call armRequest with isolated network settings", async () => {
-      const mockVNetSettings = { subnetId: "test-subnet" };
-      const mockResponse = { id: "settings-id" };
-      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
-
-      await putEphemeralUserSettings("sub-id", "eastus", mockVNetSettings);
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "/providers/Microsoft.Portal/userSettings/cloudconsole",
-        method: "PUT",
-        apiVersion: "2023-02-01-preview",
-        body: {
-          properties: {
-            preferredOsType: OsType.Linux,
-            preferredShellType: ShellType.Bash,
-            preferredLocation: "eastus",
-            networkType: NetworkType.Isolated,
-            sessionType: SessionType.Ephemeral,
-            userSubscription: "sub-id",
-            vnetSettings: mockVNetSettings,
-          },
-        },
-      });
-    });
-
-    it("should handle errors when updating settings fails", async () => {
-      const mockError = new Error("Failed to update user settings");
-      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
-
-      await expect(putEphemeralUserSettings("sub-id", "eastus")).rejects.toThrow("Failed to update user settings");
-
-      expect(armRequest).toHaveBeenCalled();
-    });
-  });
-
-  describe("verifyCloudShellProviderRegistration", () => {
-    it("should call armRequest with correct parameters", async () => {
-      const mockResponse = { registrationState: "Registered" };
-      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
-
-      const result = await verifyCloudShellProviderRegistration("sub-id");
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "/subscriptions/sub-id/providers/Microsoft.CloudShell",
-        method: "GET",
-        apiVersion: "2022-12-01",
-      });
-      expect(result).toEqual(mockResponse);
-    });
-
-    it("should handle errors when verification fails", async () => {
-      const mockError = new Error("Failed to verify provider registration");
-      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
-
-      await expect(verifyCloudShellProviderRegistration("sub-id")).rejects.toThrow(
-        "Failed to verify provider registration",
-      );
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "/subscriptions/sub-id/providers/Microsoft.CloudShell",
-        method: "GET",
-        apiVersion: "2022-12-01",
-      });
-    });
-  });
-
-  describe("registerCloudShellProvider", () => {
-    it("should call armRequest with correct parameters", async () => {
-      const mockResponse = { operationId: "op-id" };
-      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
-
-      const result = await registerCloudShellProvider("sub-id");
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "/subscriptions/sub-id/providers/Microsoft.CloudShell/register",
-        method: "POST",
-        apiVersion: "2022-12-01",
-      });
-      expect(result).toEqual(mockResponse);
-    });
-
-    it("should handle errors when registration fails", async () => {
-      const mockError = new Error("Failed to register provider");
-      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
-
-      await expect(registerCloudShellProvider("sub-id")).rejects.toThrow("Failed to register provider");
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "/subscriptions/sub-id/providers/Microsoft.CloudShell/register",
-        method: "POST",
-        apiVersion: "2022-12-01",
-      });
-    });
-  });
-
-  describe("provisionConsole", () => {
-    it("should call armRequest with correct parameters", async () => {
-      const mockResponse = { uri: "https://shell.azure.com/console123" };
-      (armRequest as jest.Mock).mockResolvedValueOnce(mockResponse);
-
-      const result = await provisionConsole("eastus");
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "providers/Microsoft.Portal/consoles/default",
-        method: "PUT",
-        apiVersion: "2023-02-01-preview",
-        customHeaders: {
-          "x-ms-console-preferred-location": "eastus",
-        },
-        body: {
-          properties: {
-            osType: OsType.Linux,
-          },
-        },
-      });
-      expect(result).toEqual(mockResponse);
-    });
-
-    it("should handle errors when console provisioning fails", async () => {
-      const mockError = new Error("Failed to provision console");
-      (armRequest as jest.Mock).mockRejectedValueOnce(mockError);
-
-      await expect(provisionConsole("eastus")).rejects.toThrow("Failed to provision console");
-
-      expect(armRequest).toHaveBeenCalledWith({
-        host: MOCK_ARM_ENDPOINT,
-        path: "providers/Microsoft.Portal/consoles/default",
-        method: "PUT",
-        apiVersion: "2023-02-01-preview",
-        customHeaders: {
-          "x-ms-console-preferred-location": "eastus",
-        },
-        body: {
-          properties: {
-            osType: OsType.Linux,
-          },
-        },
-      });
-    });
-  });
-
-  describe("connectTerminal", () => {
-    it("should call fetch with correct parameters", async () => {
-      const consoleUri = "https://shell.azure.com/console123";
-      const size = { rows: 24, cols: 80 };
-      const mockTerminalResponse = { id: "terminal-id", socketUri: "wss://shell.azure.com/socket" };
-
-      // Setup the mock response
-      mockJsonPromise.mockResolvedValueOnce(mockTerminalResponse);
-
-      const result = await connectTerminal(consoleUri, size);
-
-      expect(global.fetch).toHaveBeenCalledWith(
-        "https://shell.azure.com/console123/terminals?cols=80&rows=24&version=2019-01-01&shell=bash",
-        {
-          method: "POST",
-          headers: {
-            Accept: "application/json",
-            "Content-Type": "application/json",
-            "Content-Length": "2",
-            Authorization: "Bearer mock-token",
-            "x-ms-client-request-id": "mocked-uuid",
-            "Accept-Language": "en-US",
-          },
-          body: "{}",
-        },
-      );
-      expect(mockJsonPromise).toHaveBeenCalled();
-      expect(result).toEqual(mockTerminalResponse);
-    });
-
-    it("should handle errors when terminal connection fails", async () => {
-      const consoleUri = "https://shell.azure.com/console123";
-      const size = { rows: 24, cols: 80 };
-
-      // Mock fetch to return a failed response
-      global.fetch = jest.fn().mockImplementationOnce(() => {
-        return {
-          ok: false,
-          status: 500,
-          statusText: "Internal Server Error",
-          json: jest.fn().mockRejectedValue(new Error("Failed to parse JSON")),
-          text: jest.fn().mockResolvedValue("Server Error"),
-          headers: new Headers(),
-        } as unknown as Promise<Response>;
-      });
-
-      await expect(connectTerminal(consoleUri, size)).rejects.toThrow(
-        "Failed to connect to terminal: 500 Internal Server Error",
-      );
-
-      expect(global.fetch).toHaveBeenCalledWith(
-        "https://shell.azure.com/console123/terminals?cols=80&rows=24&version=2019-01-01&shell=bash",
-        expect.any(Object),
-      );
-    });
-  });
-});
--- a/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/Data/CloudShellClient.tsx
@@ -1,117 +0,0 @@
-import { v4 as uuidv4 } from "uuid";
-import { configContext } from "../../../../ConfigContext";
-import { userContext } from "../../../../UserContext";
-import { armRequest } from "../../../../Utils/arm/request";
-import {
-  CloudShellProviderInfo,
-  CloudShellSettings,
-  ConnectTerminalResponse,
-  NetworkType,
-  OsType,
-  ProvisionConsoleResponse,
-  SessionType,
-  ShellType,
-} from "../Models/DataModels";
-import { getLocale } from "../Utils/CommonUtils";
-
-export const getUserSettings = async (): Promise<CloudShellSettings> => {
-  return await armRequest<CloudShellSettings>({
-    host: configContext.ARM_ENDPOINT,
-    path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
-    method: "GET",
-    apiVersion: "2023-02-01-preview",
-  });
-};
-
-export const putEphemeralUserSettings = async (
-  userSubscriptionId: string,
-  userRegion: string,
-  vNetSettings?: object,
-) => {
-  const ephemeralSettings: CloudShellSettings = {
-    properties: {
-      preferredOsType: OsType.Linux,
-      preferredShellType: ShellType.Bash,
-      preferredLocation: userRegion,
-      networkType:
-        !vNetSettings || Object.keys(vNetSettings).length === 0
-          ? NetworkType.Default
-          : vNetSettings
-          ? NetworkType.Isolated
-          : NetworkType.Default,
-      sessionType: SessionType.Ephemeral,
-      userSubscription: userSubscriptionId,
-      vnetSettings: vNetSettings ?? {},
-    },
-  };
-
-  return await armRequest({
-    host: configContext.ARM_ENDPOINT,
-    path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
-    method: "PUT",
-    apiVersion: "2023-02-01-preview",
-    body: ephemeralSettings,
-  });
-};
-
-export const verifyCloudShellProviderRegistration = async (subscriptionId: string): Promise<CloudShellProviderInfo> => {
-  return await armRequest({
-    host: configContext.ARM_ENDPOINT,
-    path: `/subscriptions/${subscriptionId}/providers/Microsoft.CloudShell`,
-    method: "GET",
-    apiVersion: "2022-12-01",
-  });
-};
-
-export const registerCloudShellProvider = async (subscriptionId: string) => {
-  return await armRequest({
-    host: configContext.ARM_ENDPOINT,
-    path: `/subscriptions/${subscriptionId}/providers/Microsoft.CloudShell/register`,
-    method: "POST",
-    apiVersion: "2022-12-01",
-  });
-};
-
-export const provisionConsole = async (consoleLocation: string): Promise<ProvisionConsoleResponse> => {
-  const data = {
-    properties: {
-      osType: OsType.Linux,
-    },
-  };
-
-  return await armRequest<ProvisionConsoleResponse>({
-    host: configContext.ARM_ENDPOINT,
-    path: `providers/Microsoft.Portal/consoles/default`,
-    method: "PUT",
-    apiVersion: "2023-02-01-preview",
-    customHeaders: {
-      "x-ms-console-preferred-location": consoleLocation,
-    },
-    body: data,
-  });
-};
-
-export const connectTerminal = async (
-  consoleUri: string,
-  size: { rows: number; cols: number },
-): Promise<ConnectTerminalResponse> => {
-  const targetUri = consoleUri + `/terminals?cols=${size.cols}&rows=${size.rows}&version=2019-01-01&shell=bash`;
-  const resp = await fetch(targetUri, {
-    method: "POST",
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json",
-      "Content-Length": "2",
-      Authorization: userContext.authorizationToken,
-      "x-ms-client-request-id": uuidv4(),
-      "Accept-Language": getLocale(),
-    },
-    body: "{}", // empty body is necessary
-  });
-
-  if (!resp.ok) {
-    throw new Error(`Failed to connect to terminal: ${resp.status} ${resp.statusText}`);
-  }
-
-  return resp.json();
-};
--- a/src/Explorer/Tabs/CloudShellTab/Models/DataModels.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/Models/DataModels.tsx
@@ -1,91 +0,0 @@
-export const enum OsType {
-  Linux = "linux",
-  Windows = "windows",
-}
-
-export const enum ShellType {
-  Bash = "bash",
-  PowerShellCore = "pwsh",
-}
-
-export const enum NetworkType {
-  Default = "Default",
-  Isolated = "Isolated",
-}
-
-/**
- * Azure CloudShell session types:
- * - Mounted: Sessions with persistent storage via an Azure File Share mount.
- *   Files and configurations are preserved between sessions, allowing for
- *   continuity of work across multiple CloudShell sessions.
- *
- * - Ephemeral: Temporary sessions without persistent storage.
- *   All files and changes are discarded when the session ends.
- *   These sessions start faster but don't retain user data.
- *
- * The session type affects resource allocation, startup time,
- * and whether user files/configurations persist between sessions.
- */
-export const enum SessionType {
-  Mounted = "Mounted",
-  Ephemeral = "Ephemeral",
-}
-
-export type CloudShellSettings = {
-  properties: UserSettingProperties;
-};
-
-export type UserSettingProperties = {
-  networkType: string;
-  preferredLocation: string;
-  preferredOsType: OsType;
-  preferredShellType: ShellType;
-  userSubscription: string;
-  sessionType: SessionType;
-  vnetSettings: object;
-};
-
-export type ProvisionConsoleResponse = {
-  properties: {
-    osType: OsType;
-    provisioningState: string;
-    uri: string;
-  };
-};
-
-export type Authorization = {
-  token: string;
-};
-
-export type ConnectTerminalResponse = {
-  id: string;
-  idleTimeout: string;
-  rootDirectory: string;
-  socketUri: string;
-  tokenUpdated: boolean;
-};
-
-export type ProviderAuthorization = {
-  applicationId: string;
-  roleDefinitionId: string;
-};
-
-export type ProviderResourceType = {
-  resourceType: string;
-  locations: string[];
-  apiVersions: string[];
-  defaultApiVersion?: string;
-  capabilities?: string;
-};
-
-export type RegistrationState = "Registered" | "NotRegistered" | "Registering" | "Unregistering";
-export type RegistrationPolicy = "RegistrationRequired" | "RegistrationOptional";
-
-export type CloudShellProviderInfo = {
-  id: string;
-  namespace: string;
-  authorizations?: ProviderAuthorization[];
-  resourceTypes: ProviderResourceType[];
-  registrationState: RegistrationState;
-  registrationPolicy: RegistrationPolicy;
-};
--- a/src/Explorer/Tabs/CloudShellTab/README.md
+++ b/src/Explorer/Tabs/CloudShellTab/README.md
@@ -1,282 +0,0 @@
-# Migrate Mongo(RU/vCore)/Postgres/Cassandra shell to CloudShell Design
-
-## CloudShell Overview
-Cloud Shell provides an integrated terminal experience directly within Cosmos Explorer, allowing users to interact with different database engines using their native command-line interfaces.
-
-## Component Architecture
-
-```mermaid
-classDiagram
-    
-    class FeatureRegistration {
-        <<Registers a new flag for switching shell to CloudShell>>
-        +enableCloudShell: boolean
-    }
-    
-    class ShellTypeHandlerFactory {
-        <<Initialize corresponding handler based on the type of shell>>
-        +getHandler(terminalKind: TerminalKind): ShellTypeHandler
-        +getKey(): string
-    }
-    
-    class AbstractShellHandler {
-        <<interface>>
-        +getShellName(): string
-        +getSetUpCommands(): string[]
-        +getConnectionCommand(): string
-        +getEndpoint(): string
-        +getTerminalSuppressedData(): string[]
-        +getInitialCommands(): string
-    }
-    
-    class CloudShellTerminalComponent {
-        <<React Component to Render CloudShell>>
-        -terminalKind: TerminalKind
-        -shellHandler: AbstractShellHandler
-        +render(): ReactElement
-    }
-    
-    class CloudShellTerminalCore {
-        <<Initialize CloudShell>>
-        +startCloudShellTerminal()
-    }
-    
-    class CloudShellClient {
-        <Initialize CloudShell APIs>
-        +getUserSettings(): Promise
-        +putEphemeralUserSettings(): void
-        +verifyCloudShellProviderRegistration: void
-        +registerCloudShellProvider(): void
-        +provisionConsole(): ProvisionConsoleResponse
-        +connectTerminal(): ConnectTerminalResponse
-        +authorizeSession(): Authorization
-    }
-    
-    class CloudShellTerminalComponentAdapter {
-        +getDatabaseAccount: DataModels.DatabaseAccount,
-        +getTabId: string,
-        +getUsername: string,
-        +isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
-        +kind: ViewModels.TerminalKind,
-    }
-    
-    class TerminalTab {
-        -cloudShellTerminalComponentAdapter: CloudShellTerminalComponentAdapter
-    }
-    
-    class ContextMenuButtonFactory {
-        +getCloudShellButton(): ReactElement
-        +isCloudShellEnabled(): boolean
-    }
-    
-    UserContext --> FeatureRegistration : contains
-    FeatureRegistration ..> ContextMenuButtonFactory : controls UI visibility
-    FeatureRegistration ..> CloudShellTerminalComponentAdapter : enables tab creation
-    FeatureRegistration ..> CloudShellClient : permits API calls
-    
-    TerminalTab --> CloudShellTerminalComponentAdapter : manages
-    ContextMenuButtonFactory --> TerminalTab : creates
-    TerminalTab --> CloudShellTerminalComponent : renders
-    CloudShellTerminalComponent --> CloudShellTerminalCore : contains
-    CloudShellTerminalComponent --> ShellTypeHandlerFactory : uses
-    CloudShellTerminalCore --> CloudShellClient : communicates with
-    CloudShellTerminalCore --> AbstractShellHandler : uses configuration from
-    
-    ShellTypeHandlerFactory --> AbstractShellHandler : creates
-    
-    class MongoShellHandler {
-        -key: string
-        +getShellName(): string
-        +getSetUpCommands(): string[]
-        +getConnectionCommand(): string
-        +getEndpoint(): string
-        +getTerminalSuppressedData(): string[]
-        +getInitialCommands(): string
-    
-    class VCoreMongoShellHandler {
-        +getShellName(): string
-        +getSetUpCommands(): string[]
-        +getConnectionCommand(): string
-        +getEndpoint(): string
-        +getTerminalSuppressedData(): string[]
-        +getInitialCommands(): string
-    }
-    
-    class CassandraShellHandler {
-        -key: string
-        +getShellName(): string
-        +getSetUpCommands(): string[]
-        +getConnectionCommand(): string
-        +getEndpoint(): string
-        +getTerminalSuppressedData(): string[]
-        +getInitialCommands(): string
-    }
-    
-    class PostgresShellHandler {
-        +getShellName(): string
-        +getSetUpCommands(): string[]
-        +getConnectionCommand(): string
-        +getEndpoint(): string
-        +getTerminalSuppressedData(): string[]
-        +getInitialCommands(): string
-    }
-    
-    AbstractShellHandler <|.. MongoShellHandler
-    AbstractShellHandler <|.. VCoreMongoShellHandler
-    AbstractShellHandler <|.. CassandraShellHandler
-    AbstractShellHandler <|.. PostgresShellHandler
-```
-
-## Changes
-
-The CloudShell functionality is controlled by the feature flag `userContext.features.enableCloudShell`. When this flag is **enabled** (set to true), the following occurs in the application:
-
-1. **UI Components Become Available:** There is "Open Mongo Shell" or similar button appears on data explorer or quick start window.
-
-2. **Service Capabilities Are Activated:**
-   - Backend API calls to CloudShell services are permitted
-   - Terminal connection endpoints become accessible
-
-3. **Database-Specific Features Are Unlocked:**
-   - Terminal experiences tailored to each database type become available
-   - Shell handlers are instantiated based on the database type
-
-4. **Telemetry Collection Begins:**
-   - When CloudShell Starts
-   - User Consent to access  shell out of the region
-   - When shell is connected
-   - When there is an error during CloudShell initialization
-
-The feature can be enabled by putting `feature.enableCloudShell=true` in url.
-When disabled, all CloudShell functionality is hidden and inaccessible, ensuring a consistent user experience regardless of the feature's state. These shell would be talking to tools federation.
-
-## Supported Shell Types
-
-| Terminal Kind | Handler Class | Description |
-|---------------|--------------|-------------|
-| Mongo | MongoShellHandler | Handles MongoDB RU shell connections |
-| VCoreMongo | VCoreMongoShellHandler | Handles for VCore MongoDB shell connections |
-| Cassandra | CassandraShellHandler | Handles Cassandra shell connections |
-| Postgres | PostgresShellHandler | Handles PostgreSQL shell connections |
-
-## Implementation Details
-
-The CloudShell implementation uses the Factory pattern to create appropriate shell handlers based on the database type. Each handler implements the common interface but provides specialized behavior for connecting to different database engines.
-
-### Key Components
-
-1. **ShellTypeHandlerFactory**: Creates the appropriate handler based on terminal kind
-   - Retrieves authentication keys from Azure Resource Manager
-   - Instantiates specialized handlers with configuration
-
-2. **ShellTypeHandler Interface i.e. AbstractShellHandler**: Defines the contract for all shell handlers
-   - `getConnectionCommand()`: Returns shell command to connect to database
-   - `getSetUpCommands()`: Returns list of scripts required to set up the environment
-   - `getEndpoint()`: Returns database connection end point
-   - `getTerminalSuppressedData()`: Returns a string which needs to be suppressed
-
-3. **Specialized Handlers**: Implement specific connection logic for each database type
-   - Handle authentication differences
-   - Provide appropriate shell arguments
-   - Format connection strings correctly
-
-4. **CloudShellTerminalComponent**: React component that renders the terminal interface
-   - Receives the terminal type as a property
-   - Uses ShellTypeHandlerFactory to get the appropriate handler
-   - Renders the CloudShellTerminalCore with the handler's configuration
-   - Manages component lifecycle and state
-
-5. **CloudShellTerminalCore**: Core terminal implementation
-   - Handles low-level terminal operations
-   - Uses the configuration from ShellTypeHandler to initialize the terminal
-   - Manages input/output streams between the user interface and the shell process
-   - Handles terminal events (resize, data, etc.)
-   - Implements terminal UI and styling
-
-6. **CloudShellClient**: Client for interacting with CloudShell backend services
-   - Initializes the terminal session with backend services
-   - Manages communication between the terminal UI and the backend shell process
-   - Handles authentication and security for the terminal session
-
-7. **ContextMenuButtonFactory**: Creates CloudShell UI entry points
-   - Checks if CloudShell is enabled via `userContext.features.enableCloudShell`
-   - Generates appropriate terminal buttons based on database type
-   - Handles conditional rendering of CloudShell options
-
-8. **TerminalTab**: Container component for terminal experiences
-   - Renders appropriate terminal type based on the selected database
-   - Manages terminal tab state and lifecycle
-   - Provides the integration point between the terminal and the rest of the Cosmos Explorer UI
-
-## Telemetry Collection
-
-CloudShell components utilize `TelemetryProcessor.trace` to collect usage data and diagnostics information that help improve the service and troubleshoot issues.
-
-### Telemetry Events
-   - When CloudShell Starts
-   - User Consent to access  shell out of the region
-   - When shell is connected
-   - When there is an error during CloudShell initialization
-
-| Action Name | Description | Collected Data |
-|------------|------------|----------------|
-| CloudShellTerminalSession/Start | Triggered when user starts a CloudShell session | Shell Type, dataExplorerArea as <i>CloudShell</i>|
-| CloudShellUserConsent/(Success/Failure) | Records user consent to get cloudshell in other region |  |
-| CloudShellTerminalSession/Success | Records if Terminal creation is successful | Shell Type, Shell Region |
-| CloudShellTerminalSession/Failure | Records of terminal creation is failed | Shell Type, Shell region (if available), error message  |
-
-### Real-time Use Cases
-
-1. **Performance Monitoring**:
-   - Track shell initialization times across different regions and database types
-
-2. **Error Detection and Resolution**:
-   - Detect increased error rates in real-time
-   - Identify patterns in failures
-   - Correlate errors with specific client configurations
-
-3. **Feature Adoption Analysis**:
-   - Measure adoption rates of different terminal types
-
-4. **User Experience Optimization**:
-   - Analyze session duration to understand engagement
-   - Identify abandoned sessions and potential pain points
-   - Measure the impact of new features on usage patterns
-   - Track command completion rates and error recovery
-
-## Limitations and Regional Availability
-
-### Network Isolation
-
-Network isolation (such as private endpoints, service endpoints, and VNet integration) is not currently supported for CloudShell connections. All connections to database instances through CloudShell require the database to be accessible through public endpoints.
-
-Key limitations:
- Cannot connect to databases with public network access disabled
- No support for private link resources
- No integration with Azure Virtual Networks
- IP-based firewall rules must include CloudShell service IPs
-
-### Data Residency
-
-Data residency requirements may not be fully satisfied when using CloudShell due to limited regional availability. CloudShell services are currently available in the following regions:
-
-| Geography | Regions |
-|-----------|---------|
-| Americas | East US, West US 2, South Central US, West Central US |
-| Europe | West Europe, North Europe |
-| Asia Pacific | Southeast Asia, Japan East, Australia East |
-| Middle East | UAE North |
-
-**Note:** For up-to-date supported regions, refer to the region configuration in:
-`src/Explorer/CloudShell/Configuration/RegionConfig.ts`
-
-### Implications for Compliance
-
-Organizations with strict data residency or network isolation requirements should be aware of these limitations:
-
-1. Data may transit through regions different from the database region
-2. Terminal session data is processed in CloudShell regions, not necessarily the database region
-3. Commands and queries are executed through CloudShell services, not directly against the database
-4. Connection strings contain database endpoints and are processed by CloudShell services
-
-These limitations are important considerations for workloads with specific compliance or regulatory requirements.
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.test.tsx
@@ -1,96 +0,0 @@
-import { AbstractShellHandler, DISABLE_HISTORY, START_MARKER, EXIT_COMMAND } from "./AbstractShellHandler";
-
-// Mock implementation for testing
-class MockShellHandler extends AbstractShellHandler {
-  getShellName(): string {
-    return "MockShell";
-  }
-
-  getSetUpCommands(): string[] {
-    return ["setup-command-1", "setup-command-2"];
-  }
-
-  getConnectionCommand(): string {
-    return "mock-connection-command";
-  }
-
-  getEndpoint(): string {
-    return "mock-endpoint";
-  }
-
-  getTerminalSuppressedData(): string {
-    return "suppressed-data";
-  }
-}
-
-describe("AbstractShellHandler", () => {
-  let shellHandler: MockShellHandler;
-
-  // Reset all mocks and spies before each test
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    shellHandler = new MockShellHandler();
-  });
-
-  // Reset everything after all tests
-  afterAll(() => {
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    jest.resetModules();
-  });
-
-  // Cleanup after each test
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe("getInitialCommands", () => {
-    it("should combine commands in the correct order", () => {
-      // Spy on abstract methods to ensure they're called
-      const getSetUpCommandsSpy = jest.spyOn(shellHandler, "getSetUpCommands");
-      const getConnectionCommandSpy = jest.spyOn(shellHandler, "getConnectionCommand");
-
-      const result = shellHandler.getInitialCommands();
-
-      // Verify abstract methods were called
-      expect(getSetUpCommandsSpy).toHaveBeenCalled();
-      expect(getConnectionCommandSpy).toHaveBeenCalled();
-
-      // Verify output format and content
-      const expectedOutput = [
-        START_MARKER,
-        DISABLE_HISTORY,
-        "setup-command-1",
-        "setup-command-2",
-        `{ mock-connection-command; } || true;${EXIT_COMMAND}`,
-      ]
-        .join("\n")
-        .concat("\n");
-
-      expect(result).toBe(expectedOutput);
-    });
-  });
-
-  describe("abstract methods implementation", () => {
-    it("should return the correct shell name", () => {
-      expect(shellHandler.getShellName()).toBe("MockShell");
-    });
-
-    it("should return the setup commands", () => {
-      expect(shellHandler.getSetUpCommands()).toEqual(["setup-command-1", "setup-command-2"]);
-    });
-
-    it("should return the connection command", () => {
-      expect(shellHandler.getConnectionCommand()).toBe("mock-connection-command");
-    });
-
-    it("should return the endpoint", () => {
-      expect(shellHandler.getEndpoint()).toBe("mock-endpoint");
-    });
-
-    it("should return the terminal suppressed data", () => {
-      expect(shellHandler.getTerminalSuppressedData()).toBe("suppressed-data");
-    });
-  });
-});
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx
@@ -1,91 +0,0 @@
-/**
- * Command that serves as a marker to indicate the start of shell initialization.
- * Outputs to /dev/null to prevent displaying in the terminal.
- */
-export const START_MARKER = `echo "START INITIALIZATION" > /dev/null`;
-
-/**
- * Command to disable command history recording in the shell.
- * Prevents initialization commands from appearing in history.
- */
-export const DISABLE_HISTORY = `set +o history`;
-/**
- * Command that displays an error message and exits the shell session.
- * Used when shell initialization or connection fails.
- */
-export const EXIT_COMMAND = ` printf "\\033[1;31mSession ended. Please close this tab and initiate a new shell session if needed.\\033[0m\\n" && exit`;
-
-/**
- * Abstract class that defines the interface for shell-specific handlers
- * in the CloudShell terminal implementation. Each supported shell type
- * (Mongo, PG, etc.) should extend this class and implement
- * the required methods.
- */
-export abstract class AbstractShellHandler {
-  /**
-   * The name of the application using this shell handler.
-   * This is used for telemetry and logging purposes.
-   */
-  protected APP_NAME = "CosmosExplorerTerminal";
-
-  abstract getShellName(): string;
-  abstract getSetUpCommands(): string[];
-  abstract getConnectionCommand(): string;
-  abstract getTerminalSuppressedData(): string;
-
-  /**
-   * Constructs the complete initialization command sequence for the shell.
-   *
-   * This method:
-   * 1. Starts with the initialization marker
-   * 2. Disables command history
-   * 3. Adds shell-specific setup commands
-   * 4. Adds the connection command with error handling
-   * 5. Adds a fallback exit command if connection fails
-   *
-   * The connection command is wrapped in a construct that prevents
-   * errors from terminating the entire session immediately, allowing
-   * the friendly exit message to be displayed.
-   *
-   * @returns {string} Complete initialization command sequence with newlines
-   */
-  public getInitialCommands(): string {
-    const setupCommands = this.getSetUpCommands();
-    const connectionCommand = this.getConnectionCommand();
-
-    const allCommands = [
-      START_MARKER,
-      DISABLE_HISTORY,
-      ...setupCommands,
-      `{ ${connectionCommand}; } || true;${EXIT_COMMAND}`,
-    ];
-
-    return allCommands.join("\n").concat("\n");
-  }
-
-  /**
-   * Setup commands for MongoDB shell:
-   *
-   * 1. Check if mongosh is already installed
-   * 2. Download mongosh package if not installed
-   * 3. Extract the package to access mongosh binaries
-   * 4. Move extracted files to ~/mongosh directory
-   * 5. Add mongosh binary path to system PATH
-   * 6. Apply PATH changes by sourcing .bashrc
-   *
-   * Each command runs conditionally only if mongosh
-   * is not already present in the environment.
-   */
-  protected mongoShellSetupCommands(): string[] {
-    const PACKAGE_VERSION: string = "2.5.0";
-    return [
-      "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
-      `if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
-      `if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
-      `if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh/bin && mv mongosh-${PACKAGE_VERSION}-linux-x64/bin/mongosh ~/mongosh/bin/  && chmod +x ~/mongosh/bin/mongosh; fi`,
-      `if ! command -v mongosh &> /dev/null; then rm -rf mongosh-${PACKAGE_VERSION}-linux-x64 mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
-      "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
-      "source ~/.bashrc",
-    ];
-  }
-}
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx
@@ -1,148 +0,0 @@
-import * as CommonUtils from "../Utils/CommonUtils";
-import { CassandraShellHandler } from "./CassandraShellHandler";
-
-// Define interfaces for the database account structure
-interface DatabaseAccountProperties {
-  cassandraEndpoint?: string;
-}
-
-interface DatabaseAccount {
-  name?: string;
-  properties?: DatabaseAccountProperties;
-}
-
-// Define mock state that can be modified by tests
-const mockState = {
-  databaseAccount: {
-    name: "test-account",
-    properties: {
-      cassandraEndpoint: "https://test-endpoint.cassandra.cosmos.azure.com:443/",
-    },
-  } as DatabaseAccount,
-};
-
-// Mock dependencies using factory functions
-jest.mock("../../../../UserContext", () => ({
-  get userContext() {
-    return {
-      get databaseAccount() {
-        return mockState.databaseAccount;
-      },
-    };
-  },
-}));
-
-// Reset all modules before running tests
-beforeAll(() => {
-  jest.resetModules();
-});
-
-jest.mock("../Utils/CommonUtils", () => ({
-  getHostFromUrl: jest.fn().mockReturnValue("test-endpoint.cassandra.cosmos.azure.com"),
-}));
-
-describe("CassandraShellHandler", () => {
-  const testKey = "test-key";
-  let handler: CassandraShellHandler;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    handler = new CassandraShellHandler(testKey);
-
-    // Reset mock state before each test
-    mockState.databaseAccount = {
-      name: "test-account",
-      properties: {
-        cassandraEndpoint: "https://test-endpoint.cassandra.cosmos.azure.com:443/",
-      },
-    };
-  });
-
-  // Clean up after all tests
-  afterAll(() => {
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    jest.resetModules();
-  });
-
-  describe("Positive test cases", () => {
-    test("should return 'Cassandra' as shell name", () => {
-      expect(handler.getShellName()).toBe("Cassandra");
-    });
-
-    test("should return an array of setup commands", () => {
-      const commands = handler.getSetUpCommands();
-
-      expect(Array.isArray(commands)).toBe(true);
-      expect(commands.length).toBe(5);
-      expect(commands).toContain("source ~/.bashrc");
-      expect(
-        commands.some((cmd) =>
-          cmd.includes("if ! command -v cqlsh &> /dev/null; then echo '⚠️ cqlsh not found. Installing...'; fi"),
-        ),
-      ).toBe(true);
-      expect(commands.some((cmd) => cmd.includes("pip3 install --user cqlsh==6.2.0"))).toBe(true);
-      expect(commands.some((cmd) => cmd.includes("export SSL_VERSION=TLSv1_2"))).toBe(true);
-      expect(commands.some((cmd) => cmd.includes("export SSL_VALIDATE=false"))).toBe(true);
-    });
-
-    test("should return correct connection command", () => {
-      const expectedCommand = `cqlsh test-endpoint.cassandra.cosmos.azure.com 10350 -u test-account -p test-key --ssl`;
-
-      expect(handler.getConnectionCommand()).toBe(expectedCommand);
-      expect(CommonUtils.getHostFromUrl).toHaveBeenCalledWith("https://test-endpoint.cassandra.cosmos.azure.com:443/");
-    });
-
-    test("should return the correct terminal suppressed data", () => {
-      expect(handler.getTerminalSuppressedData()).toBe("");
-    });
-
-    test("should include the correct package version in setup commands", () => {
-      const commands = handler.getSetUpCommands();
-      const hasCorrectPackageVersion = commands.some((cmd) => cmd.includes("cqlsh==6.2.0"));
-
-      expect(hasCorrectPackageVersion).toBe(true);
-    });
-  });
-
-  describe("Negative test cases", () => {
-    test("should handle empty host from URL", () => {
-      (CommonUtils.getHostFromUrl as jest.Mock).mockReturnValueOnce("");
-
-      const command = handler.getConnectionCommand();
-
-      expect(command).toBe("cqlsh  10350 -u test-account -p test-key --ssl");
-    });
-
-    test("should handle empty key", () => {
-      const emptyKeyHandler = new CassandraShellHandler("");
-
-      expect(emptyKeyHandler.getConnectionCommand()).toBe(
-        "cqlsh test-endpoint.cassandra.cosmos.azure.com 10350 -u test-account -p  --ssl",
-      );
-    });
-
-    test("should handle undefined account name", () => {
-      mockState.databaseAccount = {
-        properties: { cassandraEndpoint: "https://test-endpoint.cassandra.cosmos.azure.com:443/" },
-      };
-
-      expect(handler.getConnectionCommand()).toBe("echo 'Database name not found.'");
-    });
-
-    test("should handle undefined database account", () => {
-      mockState.databaseAccount = undefined;
-
-      expect(handler.getConnectionCommand()).toBe("echo 'Database name not found.'");
-    });
-
-    test("should handle missing cassandra endpoint", () => {
-      mockState.databaseAccount = {
-        name: "test-account",
-        properties: {},
-      };
-
-      expect(handler.getConnectionCommand()).toBe("echo 'Cassandra endpoint not found.'");
-    });
-  });
-});
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.tsx
@@ -1,47 +0,0 @@
-import { userContext } from "../../../../UserContext";
-import { getHostFromUrl } from "../Utils/CommonUtils";
-import { AbstractShellHandler } from "./AbstractShellHandler";
-
-const PACKAGE_VERSION: string = "6.2.0";
-
-export class CassandraShellHandler extends AbstractShellHandler {
-  private _key: string;
-  private _endpoint: string | undefined;
-
-  constructor(private key: string) {
-    super();
-    this._key = key;
-    this._endpoint = userContext?.databaseAccount?.properties?.cassandraEndpoint;
-  }
-
-  public getShellName(): string {
-    return "Cassandra";
-  }
-
-  public getSetUpCommands(): string[] {
-    return [
-      "if ! command -v cqlsh &> /dev/null; then echo '⚠️ cqlsh not found. Installing...'; fi",
-      `if ! command -v cqlsh &> /dev/null; then pip3 install --user cqlsh==${PACKAGE_VERSION} ; fi`,
-      "echo 'export SSL_VERSION=TLSv1_2' >> ~/.bashrc",
-      "echo 'export SSL_VALIDATE=false' >> ~/.bashrc",
-      "source ~/.bashrc",
-    ];
-  }
-
-  public getConnectionCommand(): string {
-    if (!this._endpoint) {
-      return `echo '${this.getShellName()} endpoint not found.'`;
-    }
-
-    const dbName = userContext?.databaseAccount?.name;
-    if (!dbName) {
-      return "echo 'Database name not found.'";
-    }
-
-    return `cqlsh ${getHostFromUrl(this._endpoint)} 10350 -u ${dbName} -p ${this._key} --ssl`;
-  }
-
-  public getTerminalSuppressedData(): string {
-    return "";
-  }
-}
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx
@@ -1,130 +0,0 @@
-import { userContext } from "../../../../UserContext";
-import * as CommonUtils from "../Utils/CommonUtils";
-import { MongoShellHandler } from "./MongoShellHandler";
-
-// Define interfaces for type safety
-interface DatabaseAccountProperties {
-  mongoEndpoint?: string;
-}
-
-interface DatabaseAccount {
-  id?: string;
-  name: string;
-  location?: string;
-  type?: string;
-  kind?: string;
-  properties: DatabaseAccountProperties;
-}
-
-interface UserContextType {
-  databaseAccount: DatabaseAccount;
-}
-
-// Mock dependencies
-jest.mock("../../../../UserContext", () => ({
-  userContext: {
-    databaseAccount: {
-      name: "test-account",
-      properties: {
-        mongoEndpoint: "https://test-mongo.documents.azure.com:443/",
-      },
-    },
-  },
-}));
-
-jest.mock("../Utils/CommonUtils", () => ({
-  getHostFromUrl: jest.fn().mockReturnValue("test-mongo.documents.azure.com"),
-}));
-
-describe("MongoShellHandler", () => {
-  const testKey = "test-key";
-  let mongoShellHandler: MongoShellHandler;
-
-  beforeEach(() => {
-    mongoShellHandler = new MongoShellHandler(testKey);
-    jest.clearAllMocks();
-  });
-
-  // Clean up after each test
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  // Clean up after all tests
-  afterAll(() => {
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    jest.resetModules();
-  });
-
-  describe("getShellName", () => {
-    it("should return MongoDB", () => {
-      expect(mongoShellHandler.getShellName()).toBe("MongoDB");
-    });
-  });
-
-  describe("getSetUpCommands", () => {
-    it("should return an array of setup commands", () => {
-      const commands = mongoShellHandler.getSetUpCommands();
-
-      expect(Array.isArray(commands)).toBe(true);
-      expect(commands.length).toBe(7);
-      expect(commands[1]).toContain("mongosh-2.5.0-linux-x64.tgz");
-    });
-  });
-
-  describe("getConnectionCommand", () => {
-    it("should return the correct connection command", () => {
-      // Save original databaseAccount
-      const originalDatabaseAccount = userContext.databaseAccount;
-
-      // Directly assign the modified databaseAccount
-      (userContext as UserContextType).databaseAccount = {
-        id: "test-id",
-        name: "test-account",
-        location: "test-location",
-        type: "test-type",
-        kind: "test-kind",
-        properties: { mongoEndpoint: "https://test-mongo.documents.azure.com:443/" },
-      };
-
-      const command = mongoShellHandler.getConnectionCommand();
-
-      expect(command).toBe(
-        "mongosh mongodb://test-mongo.documents.azure.com:10255?appName=CosmosExplorerTerminal --username test-account --password test-key --tls --tlsAllowInvalidCertificates",
-      );
-      expect(CommonUtils.getHostFromUrl).toHaveBeenCalledWith("https://test-mongo.documents.azure.com:443/");
-
-      // Restore original
-      (userContext as UserContextType).databaseAccount = originalDatabaseAccount;
-    });
-
-    it("should handle missing database account name", () => {
-      // Save original databaseAccount
-      const originalDatabaseAccount = userContext.databaseAccount;
-
-      // Directly assign the modified databaseAccount
-      (userContext as UserContextType).databaseAccount = {
-        id: "test-id",
-        name: "", // Empty name to simulate missing name
-        location: "test-location",
-        type: "test-type",
-        kind: "test-kind",
-        properties: { mongoEndpoint: "https://test.com" },
-      };
-
-      const command = mongoShellHandler.getConnectionCommand();
-
-      expect(command).toBe("echo 'Database name not found.'");
-
-      // Restore original
-      (userContext as UserContextType).databaseAccount = originalDatabaseAccount;
-    });
-  });
-
-  describe("getTerminalSuppressedData", () => {
-    it("should return the correct warning message", () => {
-      expect(mongoShellHandler.getTerminalSuppressedData()).toBe("Warning: Non-Genuine MongoDB Detected");
-    });
-  });
-});
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx
@@ -1,47 +0,0 @@
-import { userContext } from "../../../../UserContext";
-import { getHostFromUrl } from "../Utils/CommonUtils";
-import { AbstractShellHandler } from "./AbstractShellHandler";
-
-export class MongoShellHandler extends AbstractShellHandler {
-  private _key: string;
-  private _endpoint: string | undefined;
-  constructor(private key: string) {
-    super();
-    this._key = key;
-    this._endpoint = userContext?.databaseAccount?.properties?.mongoEndpoint;
-  }
-
-  public getShellName(): string {
-    return "MongoDB";
-  }
-
-  public getSetUpCommands(): string[] {
-    return this.mongoShellSetupCommands();
-  }
-
-  public getConnectionCommand(): string {
-    if (!this._endpoint) {
-      return `echo '${this.getShellName()} endpoint not found.'`;
-    }
-
-    const dbName = userContext?.databaseAccount?.name;
-    if (!dbName) {
-      return "echo 'Database name not found.'";
-    }
-    return (
-      "mongosh mongodb://" +
-      getHostFromUrl(this._endpoint) +
-      ":10255?appName=" +
-      this.APP_NAME +
-      " --username " +
-      dbName +
-      " --password " +
-      this._key +
-      " --tls --tlsAllowInvalidCertificates"
-    );
-  }
-
-  public getTerminalSuppressedData(): string {
-    return "Warning: Non-Genuine MongoDB Detected";
-  }
-}
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.test.tsx
@@ -1,64 +0,0 @@
-import { PostgresShellHandler } from "./PostgresShellHandler";
-
-// Mock dependencies
-jest.mock("../../../../UserContext", () => ({
-  userContext: {
-    databaseAccount: {
-      properties: {
-        postgresqlEndpoint: "test-postgres.postgres.database.azure.com",
-      },
-    },
-    postgresConnectionStrParams: {
-      adminLogin: "test-admin",
-    },
-  },
-}));
-
-describe("PostgresShellHandler", () => {
-  let postgresShellHandler: PostgresShellHandler;
-
-  beforeEach(() => {
-    postgresShellHandler = new PostgresShellHandler();
-    jest.clearAllMocks();
-  });
-
-  // Clean up after each test
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  // Clean up after all tests
-  afterAll(() => {
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    jest.resetModules();
-  });
-
-  // Positive test cases
-  describe("Positive Tests", () => {
-    it("should return correct shell name", () => {
-      expect(postgresShellHandler.getShellName()).toBe("PostgreSQL");
-    });
-
-    it("should return array of setup commands with correct package version", () => {
-      const commands = postgresShellHandler.getSetUpCommands();
-
-      expect(Array.isArray(commands)).toBe(true);
-      expect(commands.length).toBe(9);
-      expect(commands[1]).toContain("postgresql-15.2.tar.bz2");
-      expect(commands[0]).toContain("psql not found");
-    });
-
-    it("should generate proper connection command with endpoint", () => {
-      const connectionCommand = postgresShellHandler.getConnectionCommand();
-
-      expect(connectionCommand).toContain('-h "test-postgres.postgres.database.azure.com"');
-      expect(connectionCommand).toContain("-p 5432");
-      expect(connectionCommand).toContain("--set=sslmode=require");
-    });
-
-    it("should return empty string for terminal suppressed data", () => {
-      expect(postgresShellHandler.getTerminalSuppressedData()).toBe("");
-    });
-  });
-});
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx
@@ -1,63 +0,0 @@
-import { userContext } from "../../../../UserContext";
-import { AbstractShellHandler } from "./AbstractShellHandler";
-
-const PACKAGE_VERSION: string = "15.2";
-
-export class PostgresShellHandler extends AbstractShellHandler {
-  private _endpoint: string | undefined;
-
-  constructor() {
-    super();
-    this._endpoint = userContext?.databaseAccount?.properties?.postgresqlEndpoint;
-  }
-
-  public getShellName(): string {
-    return "PostgreSQL";
-  }
-
-  /**
-   * PostgreSQL setup commands for CloudShell:
-   *
-   * 1. Check if psql client is already installed
-   * 2. Download PostgreSQL source package if needed
-   * 3. Extract the PostgreSQL package
-   * 4. Create installation directory
-   * 5. Download and extract readline dependency
-   * 6. Configure readline with appropriate installation path
-   * 7. Add PostgreSQL binaries to system PATH
-   * 8. Apply PATH changes
-   *
-   * All installation steps run conditionally only if
-   * psql is not already available in the environment.
-   */
-  public getSetUpCommands(): string[] {
-    return [
-      "if ! command -v psql &> /dev/null; then echo '⚠️ psql not found. Installing...'; fi",
-      `if ! command -v psql &> /dev/null; then curl -LO https://ftp.postgresql.org/pub/source/v${PACKAGE_VERSION}/postgresql-${PACKAGE_VERSION}.tar.bz2; fi`,
-      `if ! command -v psql &> /dev/null; then tar -xvjf postgresql-${PACKAGE_VERSION}.tar.bz2; fi`,
-      "if ! command -v psql &> /dev/null; then mkdir -p ~/pgsql; fi",
-      "if ! command -v psql &> /dev/null; then curl -LO https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz; fi",
-      "if ! command -v psql &> /dev/null; then tar -xvzf readline-8.1.tar.gz; fi",
-      "if ! command -v psql &> /dev/null; then cd readline-8.1 && ./configure --prefix=$HOME/pgsql; fi",
-      "if ! command -v psql &> /dev/null; then echo 'export PATH=$HOME/pgsql/bin:$PATH' >> ~/.bashrc; fi",
-      "source ~/.bashrc",
-    ];
-  }
-
-  public getConnectionCommand(): string {
-    if (!this._endpoint) {
-      return `echo '${this.getShellName()} endpoint not found.'`;
-    }
-
-    // Database name is hardcoded as "citus" because Azure Cosmos DB for PostgreSQL
-    // uses Citus as its distributed database extension with this default database name.
-    // All Azure Cosmos DB PostgreSQL deployments follow this convention.
-    // Ref. https://learn.microsoft.com/en-us/azure/cosmos-db/postgresql/reference-limits#database-creation
-    const loginName = userContext.postgresConnectionStrParams.adminLogin;
-    return `psql -h "${this._endpoint}" -p 5432 -d "citus" -U "${loginName}" --set=sslmode=require --set=application_name=${this.APP_NAME}`;
-  }
-
-  public getTerminalSuppressedData(): string {
-    return "";
-  }
-}
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.test.tsx
@@ -1,113 +0,0 @@
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import { listKeys } from "../../../../Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { CassandraShellHandler } from "./CassandraShellHandler";
-import { MongoShellHandler } from "./MongoShellHandler";
-import { PostgresShellHandler } from "./PostgresShellHandler";
-import { getHandler, getKey } from "./ShellTypeFactory";
-import { VCoreMongoShellHandler } from "./VCoreMongoShellHandler";
-
-// Mock dependencies
-jest.mock("../../../../UserContext", () => ({
-  userContext: {
-    databaseAccount: { name: "testDbName" },
-    subscriptionId: "testSubId",
-    resourceGroup: "testResourceGroup",
-  },
-}));
-
-jest.mock("../../../../Utils/arm/generatedClients/cosmos/databaseAccounts", () => ({
-  listKeys: jest.fn(),
-}));
-
-describe("ShellTypeHandlerFactory", () => {
-  const mockKey = "testKey";
-
-  beforeEach(() => {
-    (listKeys as jest.Mock).mockResolvedValue({ primaryMasterKey: mockKey });
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  // Clean up after each test
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  // Clean up after all tests
-  afterAll(() => {
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    jest.resetModules();
-  });
-
-  // Negative test cases
-  describe("Negative test cases", () => {
-    it("should throw an error for unsupported terminal kind", async () => {
-      await expect(getHandler("UnsupportedKind" as unknown as TerminalKind)).rejects.toThrow(
-        "Unsupported shell type: UnsupportedKind",
-      );
-    });
-
-    it("should return empty string when database name is missing", async () => {
-      // Temporarily modify the mock
-      const originalName = userContext.databaseAccount.name;
-      type DatabaseAccountType = { name: string };
-      (userContext.databaseAccount as DatabaseAccountType).name = "";
-
-      const key = await getKey();
-      expect(key).toBe("");
-      expect(listKeys).not.toHaveBeenCalled();
-
-      // Restore the mock
-      (userContext.databaseAccount as DatabaseAccountType).name = originalName;
-    });
-
-    it("should return empty string when listKeys returns null", async () => {
-      (listKeys as jest.Mock).mockResolvedValue(null);
-
-      const key = await getKey();
-      expect(key).toBe("");
-    });
-
-    it("should return empty string when primaryMasterKey is missing", async () => {
-      (listKeys as jest.Mock).mockResolvedValue({
-        /* no primaryMasterKey */
-      });
-
-      const key = await getKey();
-      expect(key).toBe("");
-    });
-  });
-
-  // Positive test cases
-  describe("Positive test cases", () => {
-    it("should return PostgresShellHandler for Postgres terminal kind", async () => {
-      const handler = await getHandler(TerminalKind.Postgres);
-      expect(handler).toBeInstanceOf(PostgresShellHandler);
-    });
-
-    it("should return MongoShellHandler with key for Mongo terminal kind", async () => {
-      const handler = await getHandler(TerminalKind.Mongo);
-      expect(handler).toBeInstanceOf(MongoShellHandler);
-    });
-
-    it("should return VCoreMongoShellHandler for VCoreMongo terminal kind", async () => {
-      const handler = await getHandler(TerminalKind.VCoreMongo);
-      expect(handler).toBeInstanceOf(VCoreMongoShellHandler);
-    });
-
-    it("should return CassandraShellHandler with key for Cassandra terminal kind", async () => {
-      const handler = await getHandler(TerminalKind.Cassandra);
-      expect(handler).toBeInstanceOf(CassandraShellHandler);
-    });
-
-    it("should get key successfully when database name exists", async () => {
-      const key = await getKey();
-      expect(key).toBe(mockKey);
-      expect(listKeys).toHaveBeenCalledWith("testSubId", "testResourceGroup", "testDbName");
-    });
-  });
-});
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/ShellTypeFactory.tsx
@@ -1,36 +0,0 @@
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import { listKeys } from "../../../../Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { AbstractShellHandler } from "./AbstractShellHandler";
-import { CassandraShellHandler } from "./CassandraShellHandler";
-import { MongoShellHandler } from "./MongoShellHandler";
-import { PostgresShellHandler } from "./PostgresShellHandler";
-import { VCoreMongoShellHandler } from "./VCoreMongoShellHandler";
-
-/**
- * Gets the appropriate handler for the given shell type
- */
-export async function getHandler(shellType: TerminalKind): Promise<AbstractShellHandler> {
-  switch (shellType) {
-    case TerminalKind.Postgres:
-      return new PostgresShellHandler();
-    case TerminalKind.Mongo:
-      return new MongoShellHandler(await getKey());
-    case TerminalKind.VCoreMongo:
-      return new VCoreMongoShellHandler();
-    case TerminalKind.Cassandra:
-      return new CassandraShellHandler(await getKey());
-    default:
-      throw new Error(`Unsupported shell type: ${shellType}`);
-  }
-}
-
-export async function getKey(): Promise<string> {
-  const dbName = userContext.databaseAccount.name;
-  if (!dbName) {
-    return "";
-  }
-
-  const keys = await listKeys(userContext.subscriptionId, userContext.resourceGroup, dbName);
-  return keys?.primaryMasterKey || "";
-}
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx
@@ -1,63 +0,0 @@
-import { VCoreMongoShellHandler } from "./VCoreMongoShellHandler";
-
-// Mock dependencies
-jest.mock("../../../../UserContext", () => ({
-  userContext: {
-    databaseAccount: {
-      properties: {
-        vcoreMongoEndpoint: "test-vcore-mongo.mongo.cosmos.azure.com",
-      },
-    },
-    vcoreMongoConnectionParams: {
-      adminLogin: "username",
-    },
-  },
-}));
-
-describe("VCoreMongoShellHandler", () => {
-  let vcoreMongoShellHandler: VCoreMongoShellHandler;
-
-  beforeEach(() => {
-    vcoreMongoShellHandler = new VCoreMongoShellHandler();
-    jest.clearAllMocks();
-  });
-
-  // Clean up after each test
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  // Clean up after all tests
-  afterAll(() => {
-    jest.resetAllMocks();
-    jest.restoreAllMocks();
-    jest.resetModules();
-  });
-
-  // Positive test cases
-  describe("Positive Tests", () => {
-    it("should return correct shell name", () => {
-      expect(vcoreMongoShellHandler.getShellName()).toBe("MongoDB VCore");
-    });
-
-    it("should return array of setup commands with correct package version", () => {
-      const commands = vcoreMongoShellHandler.getSetUpCommands();
-
-      expect(Array.isArray(commands)).toBe(true);
-      expect(commands.length).toBe(7);
-      expect(commands[1]).toContain("mongosh-2.5.0-linux-x64.tgz");
-      expect(commands[0]).toContain("mongosh not found");
-    });
-
-    it("should generate proper connection command with endpoint", () => {
-      const connectionCommand = vcoreMongoShellHandler.getConnectionCommand();
-
-      expect(connectionCommand).toContain("mongodb+srv://username:@test-vcore-mongo.mongo.cosmos.azure.com");
-      expect(connectionCommand).toContain("authMechanism=SCRAM-SHA-256");
-    });
-
-    it("should return the correct terminal suppressed data", () => {
-      expect(vcoreMongoShellHandler.getTerminalSuppressedData()).toBe("Warning: Non-Genuine MongoDB Detected");
-    });
-  });
-});
--- a/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx
@@ -1,32 +0,0 @@
-import { userContext } from "../../../../UserContext";
-import { AbstractShellHandler } from "./AbstractShellHandler";
-
-export class VCoreMongoShellHandler extends AbstractShellHandler {
-  private _endpoint: string | undefined;
-
-  constructor() {
-    super();
-    this._endpoint = userContext?.databaseAccount?.properties?.vcoreMongoEndpoint;
-  }
-
-  public getShellName(): string {
-    return "MongoDB VCore";
-  }
-
-  public getSetUpCommands(): string[] {
-    return this.mongoShellSetupCommands();
-  }
-
-  public getConnectionCommand(): string {
-    if (!this._endpoint) {
-      return `echo '${this.getShellName()} endpoint not found.'`;
-    }
-
-    const userName = userContext.vcoreMongoConnectionParams.adminLogin;
-    return `mongosh "mongodb+srv://${userName}:@${this._endpoint}/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000&appName=${this.APP_NAME}"`;
-  }
-
-  public getTerminalSuppressedData(): string {
-    return "Warning: Non-Genuine MongoDB Detected";
-  }
-}
--- a/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx
@@ -1,227 +0,0 @@
-import { IDisposable, ITerminalAddon, Terminal } from "@xterm/xterm";
-import { AbstractShellHandler } from "../ShellTypes/AbstractShellHandler";
-import { formatErrorMessage } from "./TerminalLogFormats";
-
-interface IAttachOptions {
-  bidirectional?: boolean;
-  startMarker?: string;
-  shellHandler?: AbstractShellHandler;
-}
-
-/**
- * Terminal addon that attaches a terminal to a WebSocket for bidirectional
- * communication with Azure CloudShell.
- *
- * Features:
- * - Manages bidirectional data flow between terminal and CloudShell WebSocket
- * - Processes special status messages within the data stream
- * - Controls terminal output display during shell initialization
- * - Supports shell-specific customizations via AbstractShellHandler
- *
- * @implements {ITerminalAddon}
- */
-export class AttachAddon implements ITerminalAddon {
-  private _socket: WebSocket;
-  private _bidirectional: boolean;
-  private _disposables: IDisposable[] = [];
-  private _socketData: string;
-
-  private _allowTerminalWrite: boolean = true;
-
-  private _startMarker: string;
-  private _shellHandler: AbstractShellHandler;
-
-  constructor(socket: WebSocket, options?: IAttachOptions) {
-    this._socket = socket;
-    // always set binary type to arraybuffer, we do not handle blobs
-    this._socket.binaryType = "arraybuffer";
-    this._bidirectional = !(options && options.bidirectional === false);
-    this._startMarker = options?.startMarker;
-    this._shellHandler = options?.shellHandler;
-    this._socketData = "";
-    this._allowTerminalWrite = true;
-  }
-
-  /**
-   * Activates the addon with the provided terminal
-   *
-   * Sets up event listeners for terminal input and WebSocket messages.
-   * Links the terminal input to the WebSocket and vice versa.
-   *
-   * @param {Terminal} terminal - The XTerm terminal instance
-   */
-  public activate(terminal: Terminal): void {
-    this.addMessageListener(terminal);
-    if (this._bidirectional) {
-      this._disposables.push(terminal.onData((data) => this._sendData(data)));
-      this._disposables.push(terminal.onBinary((data) => this._sendBinary(data)));
-    }
-
-    this._disposables.push(addSocketListener(this._socket, "close", () => this._handleSocketClose(terminal)));
-    this._disposables.push(addSocketListener(this._socket, "error", () => this._handleSocketClose(terminal)));
-  }
-
-  /**
-   * Handles socket close events by terminating processes and showing a message
-   */
-  private _handleSocketClose(terminal: Terminal): void {
-    if (terminal) {
-      terminal.writeln(
-        formatErrorMessage("Session ended. Please close this tab and initiate a new shell session if needed."),
-      );
-
-      // Send exit command to terminal
-      if (this._bidirectional) {
-        terminal.write(formatErrorMessage("exit\r\n"));
-      }
-    }
-
-    // Clean up resources
-    this.dispose();
-  }
-
-  /**
-   * Adds a message listener to process data from the WebSocket
-   *
-   * Handles:
-   * - Status message extraction (between ie_us and ie_ue markers)
-   * - Partial message accumulation
-   * - Shell initialization messages
-   * - Suppression of unwanted shell output
-   *
-   * @param {Terminal} terminal - The XTerm terminal instance
-   */
-  public addMessageListener(terminal: Terminal): void {
-    this._disposables.push(
-      addSocketListener(this._socket, "message", (ev) => {
-        let data: ArrayBuffer | string = ev.data;
-        const startStatusJson = "ie_us";
-        const endStatusJson = "ie_ue";
-
-        if (typeof data === "object") {
-          const enc = new TextDecoder("utf-8");
-          data = enc.decode(ev.data as ArrayBuffer);
-        }
-
-        // for example of json object look in TerminalHelper in the socket.onMessage
-        if (data.includes(startStatusJson) && data.includes(endStatusJson)) {
-          // process as one line
-          const statusData = data.split(startStatusJson)[1].split(endStatusJson)[0];
-          data = data.replace(statusData, "");
-          data = data.replace(startStatusJson, "");
-          data = data.replace(endStatusJson, "");
-        } else if (data.includes(startStatusJson)) {
-          // check for start
-          const partialStatusData = data.split(startStatusJson)[1];
-          this._socketData += partialStatusData;
-          data = data.replace(partialStatusData, "");
-          data = data.replace(startStatusJson, "");
-        } else if (data.includes(endStatusJson)) {
-          // check for end and process the command
-          const partialStatusData = data.split(endStatusJson)[0];
-          this._socketData += partialStatusData;
-          data = data.replace(partialStatusData, "");
-          data = data.replace(endStatusJson, "");
-          this._socketData = "";
-        } else if (this._socketData.length > 0) {
-          // check if the line is all data then just concatenate
-          this._socketData += data;
-          data = "";
-        }
-
-        if (this._allowTerminalWrite && data.includes(this._startMarker)) {
-          this._allowTerminalWrite = false;
-          terminal.write(`Preparing ${this._shellHandler.getShellName()} environment...\r\n`);
-        }
-
-        if (this._allowTerminalWrite) {
-          const suppressedData = this._shellHandler?.getTerminalSuppressedData();
-          const hasSuppressedData = suppressedData && suppressedData.length > 0;
-
-          if (!hasSuppressedData || !data.includes(suppressedData)) {
-            terminal.write(data);
-          }
-        }
-
-        if (data.includes(this._shellHandler.getConnectionCommand())) {
-          this._allowTerminalWrite = true;
-        }
-      }),
-    );
-  }
-
-  public dispose(): void {
-    for (const d of this._disposables) {
-      d.dispose();
-    }
-  }
-
-  /**
-   * Sends string data from the terminal to the WebSocket
-   *
-   * @param {string} data - The data to send
-   */
-  private _sendData(data: string): void {
-    if (!this._checkOpenSocket()) {
-      return;
-    }
-    this._socket.send(data);
-  }
-
-  /**
-   * Sends binary data from the terminal to the WebSocket
-   *
-   * @param {string} data - The string data to convert to binary and send
-   */
-  private _sendBinary(data: string): void {
-    if (!this._checkOpenSocket()) {
-      return;
-    }
-    const buffer = new Uint8Array(data.length);
-    for (let i = 0; i < data.length; ++i) {
-      buffer[i] = data.charCodeAt(i) & 255;
-    }
-    this._socket.send(buffer);
-  }
-
-  private _checkOpenSocket(): boolean {
-    switch (this._socket.readyState) {
-      case WebSocket.OPEN:
-        return true;
-      case WebSocket.CONNECTING:
-        throw new Error("Attach addon was loaded before socket was open");
-      case WebSocket.CLOSING:
-        return false;
-      case WebSocket.CLOSED:
-        throw new Error("Attach addon socket is closed");
-      default:
-        throw new Error("Unexpected socket state");
-    }
-  }
-}
-
-/**
- * Adds an event listener to a WebSocket and returns a disposable object
- * for cleanup
- *
- * @param {WebSocket} socket - The WebSocket instance
- * @param {K} type - The event type to listen for
- * @param {Function} handler - The event handler function
- * @returns {IDisposable} An object with a dispose method to remove the listener
- */
-function addSocketListener<K extends keyof WebSocketEventMap>(
-  socket: WebSocket,
-  type: K,
-  handler: (this: WebSocket, ev: WebSocketEventMap[K]) => void,
-): IDisposable {
-  socket.addEventListener(type, handler);
-  return {
-    dispose: () => {
-      if (!handler) {
-        // Already disposed
-        return;
-      }
-      socket.removeEventListener(type, handler);
-    },
-  };
-}
--- a/src/Explorer/Tabs/CloudShellTab/Utils/CommonUtils.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/CommonUtils.tsx
@@ -1,52 +0,0 @@
-import { Terminal } from "@xterm/xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-
-/**
- * Utility function to wait for a specified duration
- */
-export const wait = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));
-
-/**
- * Extract host from a URL
- */
-export const getHostFromUrl = (url: string): string => {
-  try {
-    const urlObj = new URL(url);
-    return urlObj.hostname;
-  } catch (error) {
-    console.error("Invalid URL:", error);
-    return "";
-  }
-};
-
-export const askConfirmation = async (terminal: Terminal, question: string): Promise<boolean> => {
-  terminal.writeln(`\n${question} (Y/N)`);
-  terminal.focus();
-  return new Promise<boolean>((resolve) => {
-    const keyListener = terminal.onKey(({ key }: { key: string }) => {
-      keyListener.dispose();
-      terminal.writeln(key);
-      return resolve(key.toLowerCase() === "y");
-    });
-  });
-};
-
-/**
- * Gets the current locale for API requests
- */
-export const getLocale = (): string => {
-  const langLocale = navigator.language;
-  return langLocale && langLocale.length > 2 ? langLocale : "en-us";
-};
-
-export const getShellNameForDisplay = (terminalKind: TerminalKind): string => {
-  switch (terminalKind) {
-    case TerminalKind.Postgres:
-      return "PostgreSQL";
-    case TerminalKind.Mongo:
-    case TerminalKind.VCoreMongo:
-      return "MongoDB";
-    default:
-      return "";
-  }
-};
--- a/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx
@@ -1,48 +0,0 @@
-// Check this list for regional availability https://azure.microsoft.com/en-us/explore/global-infrastructure/products-by-region/table
-const validCloudShellRegions = new Set([
-  "westus",
-  "southcentralus",
-  "eastus",
-  "northeurope",
-  "westeurope",
-  "centralindia",
-  "southeastasia",
-  "westcentralus",
-]);
-
-/**
- * Normalizes a region name to ensure compatibility with Azure CloudShell.
- *
- * Azure CloudShell is only available in specific regions. This function:
- * 1. Maps certain regions to their CloudShell-supported equivalents (e.g., centralus → westcentralus)
- * 2. Validates if the region is supported by CloudShell
- * 3. Falls back to the default region if the provided region is unsupported
- *
- * This ensures users can connect to CloudShell even when their database is in a region
- * where CloudShell isn't directly available, by routing to the nearest supported region.
- *
- * @param region - The source region (typically from the user's database account location)
- * @param defaultCloudshellRegion - Fallback region to use if the provided region is not supported
- * @returns A valid CloudShell region name that's as close as possible to the requested region
- *
- * @example
- * // Returns "westcentralus" (mapped region)
- * getNormalizedRegion("centralus", "westus")
- *
- * @example
- * // Returns "westus" (default region) since "antarctica" isn't supported
- * getNormalizedRegion("antarctica", "westus")
- */
-export const getNormalizedRegion = (region: string, defaultCloudshellRegion: string) => {
-  if (!region) {
-    return defaultCloudshellRegion;
-  }
-
-  const regionMap: Record<string, string> = {
-    centralus: "westcentralus",
-    eastus2: "eastus",
-  };
-
-  const normalizedRegion = regionMap[region.toLowerCase()] || region;
-  return validCloudShellRegions.has(normalizedRegion.toLowerCase()) ? normalizedRegion : defaultCloudshellRegion;
-};
--- a/src/Explorer/Tabs/CloudShellTab/Utils/TerminalLogFormats.tsx
+++ b/src/Explorer/Tabs/CloudShellTab/Utils/TerminalLogFormats.tsx
@@ -1,39 +0,0 @@
-// This file contains utility functions and constants for formatting terminal messages in a cloud shell environment.
-// It includes ANSI escape codes for colors and functions to format messages for different log levels (info, success, warning, error).
-export const TERMINAL_COLORS = {
-  RESET: "\x1b[0m",
-  BRIGHT: "\x1b[1m",
-  DIM: "\x1b[2m",
-  BLACK: "\x1b[30m",
-  RED: "\x1b[31m",
-  GREEN: "\x1b[32m",
-  YELLOW: "\x1b[33m",
-  BLUE: "\x1b[34m",
-  MAGENTA: "\x1b[35m",
-  CYAN: "\x1b[36m",
-  WHITE: "\x1b[37m",
-  BG_BLACK: "\x1b[40m",
-  BG_RED: "\x1b[41m",
-  BG_GREEN: "\x1b[42m",
-  BG_YELLOW: "\x1b[43m",
-  BG_BLUE: "\x1b[44m",
-  BG_MAGENTA: "\x1b[45m",
-  BG_CYAN: "\x1b[46m",
-  BG_WHITE: "\x1b[47m",
-};
-
-export const START_MARKER = `echo "START INITIALIZATION" > /dev/null`;
-export const END_MARKER = `echo "END INITIALIZATION" > /dev/null`;
-
-// Terminal message formatting functions
-export const formatInfoMessage = (message: string): string =>
-  `${TERMINAL_COLORS.BRIGHT}${TERMINAL_COLORS.CYAN}${message}${TERMINAL_COLORS.RESET}`;
-
-export const formatSuccessMessage = (message: string): string =>
-  `${TERMINAL_COLORS.BRIGHT}${TERMINAL_COLORS.GREEN}${message}${TERMINAL_COLORS.RESET}`;
-
-export const formatWarningMessage = (message: string): string =>
-  `${TERMINAL_COLORS.BRIGHT}${TERMINAL_COLORS.YELLOW}${message}${TERMINAL_COLORS.RESET}`;
-
-export const formatErrorMessage = (message: string): string =>
-  `${TERMINAL_COLORS.BRIGHT}${TERMINAL_COLORS.RED}${message}${TERMINAL_COLORS.RESET}`;
--- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
+++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
@@ -26,6 +26,7 @@ import { useDialog } from "Explorer/Controls/Dialog";
 import { EditorReact } from "Explorer/Controls/Editor/EditorReact";
 import { InputDataList, InputDatalistDropdownOptionSection } from "Explorer/Controls/InputDataList/InputDataList";
 import { ProgressModalDialog } from "Explorer/Controls/ProgressModalDialog";
+import Explorer from "Explorer/Explorer";
 import { useCommandBar } from "Explorer/Menus/CommandBar/CommandBarComponentAdapter";
 import { querySampleDocuments, readSampleDocument } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import {
@@ -63,7 +64,7 @@ import * as Logger from "../../../Common/Logger";
 import * as MongoProxyClient from "../../../Common/MongoProxyClient";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import { CollectionBase, UploadDetailsRecord } from "../../../Contracts/ViewModels";
+import { CollectionBase } from "../../../Contracts/ViewModels";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import * as QueryUtils from "../../../Utils/QueryUtils";
 import { defaultQueryFields, extractPartitionKeyValues } from "../../../Utils/QueryUtils";
@@ -143,13 +144,6 @@ export const useDocumentsTabStyles = makeStyles({
  deleteProgressContent: {
    paddingTop: tokens.spacingVerticalL,
  },
-  smallScreenContent: {
-    "@media (max-width: 420px)": {
-      flexWrap: "wrap",
-      minHeight: "max-content",
-      padding: "4px",
-    },
-  },
 });

 export class DocumentsTabV2 extends TabsBase {
@@ -308,6 +302,7 @@ type UiKeyboardEvent = (e: KeyboardEvent | React.SyntheticEvent<Element, Event>)

 // Export to expose to unit tests
 export type ButtonsDependencies = {
+  _collection: ViewModels.CollectionBase;
  selectedRows: Set<TableRowId>;
  editorState: ViewModels.DocumentExplorerState;
  isPreferredApiMongoDB: boolean;
@@ -318,7 +313,26 @@ export type ButtonsDependencies = {
  onSaveExistingDocumentClick: UiKeyboardEvent;
  onRevertExistingDocumentClick: UiKeyboardEvent;
  onDeleteExistingDocumentsClick: UiKeyboardEvent;
-  onUploadDocumentsClick: UiKeyboardEvent;
+};
+
+const createUploadButton = (container: Explorer): CommandButtonComponentProps => {
+  const label = "Upload Item";
+  return {
+    id: UPLOAD_BUTTON_ID,
+    iconSrc: UploadIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
+      selectedCollection && container.openUploadItemsPane();
+    },
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+    disabled:
+      useSelectedNode.getState().isDatabaseNodeOrNoneSelected() ||
+      !useClientWriteEnabled.getState().clientWriteEnabled ||
+      useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+  };
 };

 // Export to expose to unit tests
@@ -331,6 +345,7 @@ export const UPLOAD_BUTTON_ID = "uploadItemBtn";

 // Export to expose in unit tests
 export const getTabsButtons = ({
+  _collection,
  selectedRows,
  editorState,
  isPreferredApiMongoDB,
@@ -341,7 +356,6 @@ export const getTabsButtons = ({
  onSaveExistingDocumentClick,
  onRevertExistingDocumentClick,
  onDeleteExistingDocumentsClick,
-  onUploadDocumentsClick,
 }: ButtonsDependencies): CommandButtonComponentProps[] => {
  if (isFabric() && userContext.fabricContext?.isReadOnly) {
    // All the following buttons require write access
@@ -453,20 +467,7 @@ export const getTabsButtons = ({
  }

  if (!isPreferredApiMongoDB) {
-    const label = "Upload Item";
-    buttons.push({
-      id: UPLOAD_BUTTON_ID,
-      iconSrc: UploadIcon,
-      iconAlt: label,
-      onCommandClick: onUploadDocumentsClick,
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      disabled:
-        useSelectedNode.getState().isDatabaseNodeOrNoneSelected() ||
-        !useClientWriteEnabled.getState().clientWriteEnabled ||
-        useSelectedNode.getState().isQueryCopilotCollectionSelected(),
-    });
+    buttons.push(createUploadButton(_collection.container));
  }

  return buttons;
@@ -671,7 +672,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
    collection: CollectionBase;
  }>(undefined);
  const [bulkDeleteMode, setBulkDeleteMode] = useState<"inProgress" | "completed" | "aborting" | "aborted">(undefined);
-  const [abortController, setAbortController] = useState<AbortController | undefined>(undefined);

  const setKeyboardActions = useKeyboardActionGroup(KeyboardActionGroup.ACTIVE_TAB);

@@ -699,19 +699,13 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
      return;
    }

-    if (bulkDeleteProcess.pendingIds.length === 0 && bulkDeleteProcess.throttledIds.length === 0) {
-      // Successfully deleted all documents
+    if (
+      (bulkDeleteProcess.pendingIds.length === 0 && bulkDeleteProcess.throttledIds.length === 0) ||
+      bulkDeleteMode === "aborting"
+    ) {
+      // Successfully deleted all documents or operation was aborted
      bulkDeleteOperation.onCompleted(bulkDeleteProcess.successfulIds);
-      setBulkDeleteMode("completed");
-      return;
-    }
-
-    if (bulkDeleteMode === "aborting") {
-      // Operation was aborted
-      abortController?.abort();
-      bulkDeleteOperation.onCompleted(bulkDeleteProcess.successfulIds);
-      setBulkDeleteMode("aborted");
-      setAbortController(undefined);
+      setBulkDeleteMode(bulkDeleteMode === "aborting" ? "aborted" : "completed");
      return;
    }

@@ -719,10 +713,8 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
    const newPendingIds = bulkDeleteProcess.pendingIds.concat(bulkDeleteProcess.throttledIds);
    const timeout = bulkDeleteProcess.beforeExecuteMs || 0;

-    const ac = new AbortController();
-    setAbortController(ac);
    setTimeout(() => {
-      deleteNoSqlDocuments(bulkDeleteOperation.collection, [...newPendingIds], ac.signal)
+      deleteNoSqlDocuments(bulkDeleteOperation.collection, [...newPendingIds])
        .then((deleteResult) => {
          let retryAfterMilliseconds = 0;
          const newSuccessful: DocumentId[] = [];
@@ -737,7 +729,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
            } else if (result.statusCode >= 400) {
              newFailed.push(result.documentId);
              logConsoleError(
-                `Failed to delete document ${result.documentId.id()} with status code ${result.statusCode}`,
+                `Failed to delete document ${result.documentId.id} with status code ${result.statusCode}`,
              );
            }
          });
@@ -878,6 +870,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
    }

    updateNavbarWithTabsButtons(isTabActive, {
+      _collection,
      selectedRows,
      editorState,
      isPreferredApiMongoDB,
@@ -888,7 +881,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
      onSaveExistingDocumentClick,
      onRevertExistingDocumentClick,
      onDeleteExistingDocumentsClick,
-      onUploadDocumentsClick,
    });
  }, []);

@@ -1294,47 +1286,11 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
      );
  }, [deleteDocuments, documentIds, isPreferredApiMongoDB, selectedRows]);

-  const onUploadDocumentsClick = useCallback((): void => {
-    if (!isPreferredApiMongoDB) {
-      const onSuccessUpload = (data: UploadDetailsRecord[]) => {
-        const addedIdsSet = new Set(
-          data
-            .reduce(
-              (result: ItemDefinition[], record) =>
-                result.concat(record.resources && record.resources.length ? record.resources : []),
-              [],
-            )
-            .map((document) => {
-              const partitionKeyValueArray: PartitionKey[] = extractPartitionKeyValues(
-                document,
-                partitionKey as PartitionKeyDefinition,
-              );
-              return newDocumentId(
-                document as ItemDefinition & Resource,
-                partitionKeyProperties,
-                partitionKeyValueArray as string[],
-              );
-            }),
-        );
-
-        const documents = new Set(documentIds);
-        addedIdsSet.forEach((item) => documents.add(item));
-        setDocumentIds(Array.from(documents));
-
-        setSelectedDocumentContent(undefined);
-        setClickedRowIndex(undefined);
-        setSelectedRows(new Set());
-        setEditorState(ViewModels.DocumentExplorerState.noDocumentSelected);
-      };
-
-      _collection.container.openUploadItemsPane(onSuccessUpload);
-    }
-  }, [_collection.container, documentIds, isPreferredApiMongoDB, newDocumentId, partitionKey, partitionKeyProperties]);
-
  // If editor state changes, update the nav
  useEffect(
    () =>
      updateNavbarWithTabsButtons(isTabActive, {
+        _collection,
        selectedRows,
        editorState,
        isPreferredApiMongoDB,
@@ -1343,11 +1299,11 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
        onSaveNewDocumentClick,
        onRevertNewDocumentClick,
        onSaveExistingDocumentClick,
-        onRevertExistingDocumentClick,
-        onDeleteExistingDocumentsClick,
-        onUploadDocumentsClick,
+        onRevertExistingDocumentClick: onRevertExistingDocumentClick,
+        onDeleteExistingDocumentsClick: onDeleteExistingDocumentsClick,
      }),
    [
+      _collection,
      selectedRows,
      editorState,
      isPreferredApiMongoDB,
@@ -1358,7 +1314,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
      onSaveExistingDocumentClick,
      onRevertExistingDocumentClick,
      onDeleteExistingDocumentsClick,
-      onUploadDocumentsClick,
      isTabActive,
    ],
  );
@@ -2147,7 +2102,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
  return (
    <CosmosFluentProvider className={styles.container}>
      <div data-test={"DocumentsTab"} className="tab-pane active" role="tabpanel" style={{ display: "flex" }}>
-        <div data-test={"DocumentsTab/Filter"} className={`${styles.filterRow} ${styles.smallScreenContent}`}>
+        <div data-test={"DocumentsTab/Filter"} className={styles.filterRow}>
          {!isPreferredApiMongoDB && <span> SELECT * FROM c </span>}
          <InputDataList
            dropdownOptions={getFilterChoices()}
--- a/src/Explorer/Tabs/DocumentsTabV2/snapshots/DocumentsTabV2.test.tsx.snap
+++ b/src/Explorer/Tabs/DocumentsTabV2/snapshots/DocumentsTabV2.test.tsx.snap
@@ -15,7 +15,7 @@ exports[`Documents tab (noSql API) when rendered should render the page 1`] = `
    }
  >
    <div
-      className="___11ktxfv_0000000 f1o614cb fy9rknc f22iagw fsnqrgy f1f5gg8d fjodcmx f122n59 f1f09k3d fg706s2 frpde29 ___1ngl8o6_0000000 fz7mnu6 fl3egqs flhmrkm"
+      className="___11ktxfv_0000000 f1o614cb fy9rknc f22iagw fsnqrgy f1f5gg8d fjodcmx f122n59 f1f09k3d fg706s2 frpde29"
      data-test="DocumentsTab/Filter"
    >
      <span>
--- a/src/Explorer/Tabs/QueryTab/QueryResultSection.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryResultSection.tsx
@@ -8,8 +8,6 @@ import RunQuery from "../../../../images/RunQuery.png";
 import { QueryResults } from "../../../Contracts/ViewModels";
 import { ErrorList } from "./ErrorList";
 import { ResultsView } from "./ResultsView";
-import useZoomLevel from "hooks/useZoomLevel";
-import { conditionalClass } from "Utils/StyleUtils";

 export interface ResultsViewProps {
  isMongoDB: boolean;
@@ -25,16 +23,11 @@ interface QueryResultProps extends ResultsViewProps {

 const ExecuteQueryCallToAction: React.FC = () => {
  const styles = useQueryTabStyles();
-  const isZoomed = useZoomLevel();
  return (
    <div data-test="QueryTab/ResultsPane/ExecuteCTA" className={styles.executeCallToAction}>
      <div>
        <p>
-          <img
-            className={`${styles.responsiveImg} ${conditionalClass(isZoomed, styles.zoomedImageSize)}`}
-            src={RunQuery}
-            aria-hidden="true"
-          />
+          <img src={RunQuery} aria-hidden="true" />
        </p>
        <p>Execute a query to see the results</p>
      </div>
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-console */
-import { FeedOptions } from "@azure/cosmos";
+import { FeedOptions, QueryOperationOptions } from "@azure/cosmos";
 import { AuthType } from "AuthType";
 import QueryError, { createMonacoErrorLocationResolver, createMonacoMarkersForQueryErrors } from "Common/QueryError";
 import { SplitterDirection } from "Common/Splitter";
@@ -19,7 +19,7 @@ import { CosmosFluentProvider } from "Explorer/Theme/ThemeUtil";
 import { useSelectedNode } from "Explorer/useSelectedNode";
 import { KeyboardAction } from "KeyboardShortcuts";
 import { QueryConstants } from "Shared/Constants";
-import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
+import { LocalStorageUtility, StorageKey, getRUThreshold, ruThresholdEnabled } from "Shared/StorageUtility";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { Allotment } from "allotment";
 import { useClientWriteEnabled } from "hooks/useClientWriteEnabled";
@@ -55,8 +55,6 @@ import { BrowseQueriesPane } from "../../Panes/BrowseQueriesPane/BrowseQueriesPa
 import { SaveQueryPane } from "../../Panes/SaveQueryPane/SaveQueryPane";
 import TabsBase from "../TabsBase";
 import "./QueryTabComponent.less";
-import { useQueryMetadataStore } from "./useQueryMetadataStore"; // adjust path if needed
-

 enum ToggleState {
  Result,
@@ -198,10 +196,7 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
      enabled: !!this.state.sqlQueryEditorContent && this.state.sqlQueryEditorContent.length > 0,
      visible: true,
    };
-      // const query=this.state.sqlQueryEditorContent;
-      // const db = this.props.collection.databaseId;
-      // const container = this.props.collection.id();
-      
+
    const isSaveQueryBtnEnabled = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
    this.saveQueryButton = {
      enabled: isSaveQueryBtnEnabled,
@@ -265,10 +260,6 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
  }

  public onExecuteQueryClick = async (): Promise<void> => {
-      const query1=this.state.sqlQueryEditorContent;
-      const db = this.props.collection.databaseId;
-      const container = this.props.collection.id();
-    useQueryMetadataStore.getState().setMetadata(query1, db, container);
    this._iterator = undefined;

    setTimeout(async () => {
@@ -378,9 +369,22 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
    this.setState({
      isExecutionError: false,
    });
-    this.props.tabsBaseInstance.isExecutionWarning(false);
+
+    let queryOperationOptions: QueryOperationOptions;
+    if (userContext.apiType === "SQL" && ruThresholdEnabled()) {
+      const ruThreshold: number = getRUThreshold();
+      queryOperationOptions = {
+        ruCapPerOperation: ruThreshold,
+      } as QueryOperationOptions;
+    }
+
    const queryDocuments = async (firstItemIndex: number) =>
-      await queryDocumentsPage(this.props.collection && this.props.collection.id(), this._iterator, firstItemIndex);
+      await queryDocumentsPage(
+        this.props.collection && this.props.collection.id(),
+        this._iterator,
+        firstItemIndex,
+        queryOperationOptions,
+      );
    this.props.tabsBaseInstance.isExecuting(true);
    this.setState({
      isExecuting: true,
@@ -420,9 +424,6 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
        firstItemIndex,
        queryDocuments,
      );
-      if (queryResults.ruThresholdExceeded) {
-        this.props.tabsBaseInstance.isExecutionWarning(true);
-      }
      this.setState({ queryResults, errors: [] });
    } catch (error) {
      this.props.tabsBaseInstance.isExecutionError(true);
--- a/src/Explorer/Tabs/QueryTab/ResultsView.tsx
+++ b/src/Explorer/Tabs/QueryTab/ResultsView.tsx
@@ -1,7 +1,5 @@
-import { FontIcon } from "@fluentui/react";
 import {
  Button,
-  Checkbox,
  DataGrid,
  DataGridBody,
  DataGridCell,
@@ -10,41 +8,30 @@ import {
  DataGridRow,
  SelectTabData,
  SelectTabEvent,
-  Spinner,
  Tab,
  TabList,
-  Table,
-  TableBody,
-  TableCell,
  TableColumnDefinition,
-  TableHeader,
-  TableRow,
-  createTableColumn
+  createTableColumn,
 } from "@fluentui/react-components";
-import { ArrowDownloadRegular, ChevronDown20Regular, ChevronRight20Regular, CircleFilled, CopyRegular } from "@fluentui/react-icons";
-import copy from "clipboard-copy";
+import { ArrowDownloadRegular, CopyRegular } from "@fluentui/react-icons";
 import { HttpHeaders } from "Common/Constants";
 import MongoUtility from "Common/MongoUtility";
 import { QueryMetrics } from "Contracts/DataModels";
 import { EditorReact } from "Explorer/Controls/Editor/EditorReact";
 import { IDocument } from "Explorer/Tabs/QueryTab/QueryTabComponent";
 import { useQueryTabStyles } from "Explorer/Tabs/QueryTab/Styles";
-import { useQueryMetadataStore } from "Explorer/Tabs/QueryTab/useQueryMetadataStore";
-import React, { useCallback, useEffect, useState } from "react";
 import { userContext } from "UserContext";
-import { logConsoleProgress } from "Utils/NotificationConsoleUtils";
-import { client } from "../../../Common/CosmosClient";
-import { handleError } from "../../../Common/ErrorHandlingUtils";
+import copy from "clipboard-copy";
+import React, { useCallback, useState } from "react";
 import { ResultsViewProps } from "./QueryResultSection";
+
 enum ResultsTabs {
  Results = "results",
  QueryStats = "queryStats",
-  IndexAdvisor = "indexadv",
 }

 const ResultsTab: React.FC<ResultsViewProps> = ({ queryResults, isMongoDB, executeQueryDocumentsPage }) => {
  const styles = useQueryTabStyles();
-  /* eslint-disable react/prop-types */
  const queryResultsString = queryResults
    ? isMongoDB
      ? MongoUtility.tojson(queryResults.documents, undefined, false)
@@ -60,172 +47,6 @@ const ResultsTab: React.FC<ResultsViewProps> = ({ queryResults, isMongoDB, execu
    await executeQueryDocumentsPage(firstItemIndex + itemCount - 1);
  };

-  const ExportResults: React.FC = () => {
-    const [showDropdown, setShowDropdown] = useState(false);
-    const dropdownRef = React.useRef<HTMLDivElement>(null);
-
-    React.useEffect(() => {
-      const handleClickOutside = (event: MouseEvent) => {
-        if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
-          setShowDropdown(false);
-        }
-      };
-
-      if (showDropdown) {
-        document.addEventListener("mousedown", handleClickOutside);
-      }
-      return () => {
-        document.removeEventListener("mousedown", handleClickOutside);
-      };
-    }, [showDropdown]);
-
-    const escapeCsvValue = (value: string): string => {
-      return `"${value.replace(/"/g, '""')}"`;
-    };
-
-    const formatValueForCsv = (value: string | object): string => {
-      if (value === null || value === undefined) {
-        return "";
-      }
-      if (typeof value === "object") {
-        return escapeCsvValue(JSON.stringify(value));
-      }
-      return escapeCsvValue(String(value));
-    };
-
-    const exportToCsv = () => {
-      try {
-        const allHeadersSet = new Set<string>();
-        queryResults.documents.forEach((doc) => {
-          Object.keys(doc).forEach((key) => allHeadersSet.add(key));
-        });
-
-        const allHeaders = Array.from(allHeadersSet);
-        const csvHeader = allHeaders.map(escapeCsvValue).join(",");
-        const csvData = queryResults.documents
-          .map((doc) =>
-            allHeaders.map((header) => (doc[header] !== undefined ? formatValueForCsv(doc[header]) : "")).join(","),
-          )
-          .join("\n");
-
-        const csvContent = `sep=,\n${csvHeader}\n${csvData}`;
-        downloadFile(csvContent, "query-results.csv", "text/csv");
-      } catch (error) {
-        console.error("Failed to export CSV:", error);
-      }
-    };
-
-    const exportToJson = () => {
-      try {
-        downloadFile(queryResultsString, "query-results.json", "application/json");
-      } catch (error) {
-        console.error("Failed to export JSON:", error);
-      }
-    };
-
-    const downloadFile = (content: string, fileName: string, contentType: string) => {
-      const blob = new Blob([content], { type: contentType });
-      const url = URL.createObjectURL(blob);
-      const downloadLink = document.createElement("a");
-      downloadLink.href = url;
-      downloadLink.download = fileName;
-      document.body.appendChild(downloadLink);
-      downloadLink.click();
-      document.body.removeChild(downloadLink);
-      setTimeout(() => URL.revokeObjectURL(url), 100);
-    };
-
-    const handleExport = (format: "CSV" | "JSON") => {
-      setShowDropdown(false);
-      if (format === "CSV") {
-        exportToCsv();
-      } else {
-        exportToJson();
-      }
-    };
-
-    const handleKeyDown = (e: React.KeyboardEvent, format: "CSV" | "JSON") => {
-      if (e.key === "Enter" || e.key === " ") {
-        e.preventDefault();
-        handleExport(format);
-      } else if (e.key === "Escape") {
-        setShowDropdown(false);
-      }
-    };
-
-    return (
-      <div style={{ position: "relative", display: "inline-block" }} ref={dropdownRef}>
-        <Button
-          onClick={() => setShowDropdown((v) => !v)}
-          size="small"
-          appearance="transparent"
-          icon={<ArrowDownloadRegular />}
-          title="Download Query Results"
-          aria-haspopup="listbox"
-          aria-expanded={showDropdown}
-        />
-        {showDropdown && (
-          <div
-            style={{
-              position: "absolute",
-              right: 0,
-              zIndex: 10,
-              background: "white",
-              border: "1px solid #ccc",
-              borderRadius: 2,
-              minWidth: 60,
-              boxShadow: "0 2px 8px rgba(0,0,0,0.15)",
-              marginTop: 4,
-            }}
-            role="listbox"
-            tabIndex={-1}
-          >
-            <button
-              style={{
-                display: "block",
-                width: "100%",
-                padding: "8px 16px",
-                background: "none",
-                border: "none",
-                textAlign: "left",
-                cursor: "pointer",
-                transition: "background 0.2s",
-              }}
-              onMouseOver={(e) => (e.currentTarget.style.background = "#f3f3f3")}
-              onMouseOut={(e) => (e.currentTarget.style.background = "none")}
-              onClick={() => handleExport("JSON")}
-              onKeyDown={(e) => handleKeyDown(e, "JSON")}
-              role="option"
-              tabIndex={0}
-            >
-              JSON
-            </button>
-            <button
-              style={{
-                display: "block",
-                width: "100%",
-                padding: "8px 16px",
-                background: "none",
-                border: "none",
-                textAlign: "left",
-                cursor: "pointer",
-                transition: "background 0.2s",
-              }}
-              onMouseOver={(e) => (e.currentTarget.style.background = "#f3f3f3")}
-              onMouseOut={(e) => (e.currentTarget.style.background = "none")}
-              onClick={() => handleExport("CSV")}
-              onKeyDown={(e) => handleKeyDown(e, "CSV")}
-              role="option"
-              tabIndex={0}
-            >
-              CSV
-            </button>
-          </div>
-        )}
-      </div>
-    );
-  };
-
  return (
    <>
      <div className={styles.queryResultsBar}>
@@ -246,7 +67,6 @@ const ResultsTab: React.FC<ResultsViewProps> = ({ queryResults, isMongoDB, execu
          aria-label="Copy"
          onClick={onClickCopyResults}
        />
-        <ExportResults />
      </div>
      <div className={styles.queryResultsViewer}>
        <EditorReact language={"json"} content={queryResultsString} isReadOnly={true} ariaLabel={"Query results"} />
@@ -392,8 +212,9 @@ const QueryStatsTab: React.FC<Pick<ResultsViewProps, "queryResults">> = ({ query
        },
        {
          metric: "User defined function execution time",
-          value: `${aggregatedQueryMetrics.runtimeExecutionTimes?.userDefinedFunctionExecutionTime?.toString() || 0
-            } ms`,
+          value: `${
+            aggregatedQueryMetrics.runtimeExecutionTimes?.userDefinedFunctionExecutionTime?.toString() || 0
+          } ms`,
          toolTip: "Total time spent executing user-defined functions",
        },
        {
@@ -534,394 +355,6 @@ const QueryStatsTab: React.FC<Pick<ResultsViewProps, "queryResults">> = ({ query
  );
 };

-interface IIndexMetric {
-  index: string;
-  impact: string;
-  section: "Included" | "Not Included" | "Header";
-}
-const IndexAdvisorTab: React.FC = () => {
-  const { userQuery, databaseId, containerId } = useQueryMetadataStore();
-  const [loading, setLoading] = useState(true);
-  const [indexMetrics, setIndexMetrics] = useState<any>(null);
-  const [showIncluded, setShowIncluded] = useState(true);
-  const [showNotIncluded, setShowNotIncluded] = useState(true);
-  const [selectedIndexes, setSelectedIndexes] = useState<any[]>([]);
-  const [selectAll, setSelectAll] = useState(false);
-  const [updateMessageShown, setUpdateMessageShown] = useState(false);
-  const [included, setIncludedIndexes] = useState<IIndexMetric[]>([]);
-  const [notIncluded, setNotIncludedIndexes] = useState<IIndexMetric[]>([]);
-
-  useEffect(() => {
-    async function fetchIndexMetrics() {
-      const clearMessage = logConsoleProgress(`Querying items with IndexMetrics in container ${containerId}`);
-      try {
-        const querySpec = {
-          query: userQuery || "SELECT TOP 10 c.id FROM c WHERE c.Item = 'value1234' ",
-        };
-        const sdkResponse = await client()
-          .database(databaseId)
-          .container(containerId)
-          .items.query(querySpec, {
-            populateIndexMetrics: true,
-          })
-          .fetchAll();
-        setIndexMetrics(sdkResponse.indexMetrics);
-      } catch (error) {
-        handleError(error, "queryItemsWithIndexMetrics", `Error querying items from ${containerId}`);
-      } finally {
-        clearMessage();
-        setLoading(false);
-      }
-    }
-    if (userQuery && databaseId && containerId) {
-      fetchIndexMetrics();
-    }
-  }, [userQuery, databaseId, containerId]);
-
-  useEffect(() => {
-    if (!indexMetrics) return;
-
-    const included: any[] = [];
-    const notIncluded: any[] = [];
-    const lines = indexMetrics.split("\n").map((line: string) => line.trim()).filter(Boolean);
-    let currentSection = "";
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      if (line.startsWith("Utilized Single Indexes") || line.startsWith("Utilized Composite Indexes")) {
-        currentSection = "included";
-      } else if (line.startsWith("Potential Single Indexes") || line.startsWith("Potential Composite Indexes")) {
-        currentSection = "notIncluded";
-      } else if (line.startsWith("Index Spec:")) {
-        const index = line.replace("Index Spec:", "").trim();
-        const impactLine = lines[i + 1];
-        const impact = impactLine?.includes("Index Impact Score:") ? impactLine.split(":")[1].trim() : "Unknown";
-
-        const isComposite = index.includes(",");
-        const indexObj: any = { index, impact };
-        if (isComposite) {
-          indexObj.composite = index.split(",").map((part: string) => {
-            const [path, order] = part.trim().split(/\s+/);
-            return {
-              path: path.trim(),
-              order: order?.toLowerCase() === "desc" ? "descending" : "ascending",
-            };
-          });
-        } else {
-          let path = "/unknown/*";
-          const pathRegex = /\/[^\/\s*?]+(?:\/[^\/\s*?]+)*(\/\*|\?)/;
-          const match = index.match(pathRegex);
-          if (match) {
-            path = match[0];
-          } else {
-            const simplePathRegex = /\/[^\/\s]+/;
-            const simpleMatch = index.match(simplePathRegex);
-            if (simpleMatch) {
-              path = simpleMatch[0] + "/*";
-            }
-          }
-          indexObj.path = path;
-        }
-
-        if (currentSection === "included") {
-          included.push(indexObj);
-        } else if (currentSection === "notIncluded") {
-          notIncluded.push(indexObj);
-        }
-      }
-    }
-    setIncludedIndexes(included);
-    setNotIncludedIndexes(notIncluded);
-  }, [indexMetrics]);
-
-  useEffect(() => {
-    const allSelected = notIncluded.length > 0 && notIncluded.every((item) => selectedIndexes.some((s) => s.index === item.index));
-    setSelectAll(allSelected);
-  }, [selectedIndexes, notIncluded]);
-
-  const handleCheckboxChange = (indexObj: any, checked: boolean) => {
-    if (checked) {
-      setSelectedIndexes((prev) => [...prev, indexObj]);
-    } else {
-      setSelectedIndexes((prev) =>
-        prev.filter((item) => item.index !== indexObj.index)
-      );
-    }
-  };
-
-  const handleSelectAll = (checked: boolean) => {
-    setSelectAll(checked);
-    setSelectedIndexes(checked ? notIncluded : []);
-  };
-
-  const handleUpdatePolicy = async () => {
-    if (selectedIndexes.length === 0) {
-      console.log("No indexes selected for update");
-      return;
-    }
-    try {
-      const { resource: containerDef } = await client()
-        .database(databaseId)
-        .container(containerId)
-        .read();
-
-      const newIncludedPaths = selectedIndexes
-        .filter(index => !index.composite)
-        .map(index => {
-
-          return {
-            path: index.path,
-          };
-        });
-
-      const newCompositeIndexes = selectedIndexes
-        .filter(index => index.composite)
-        .map(index => index.composite);
-
-      const updatedPolicy = {
-        ...containerDef.indexingPolicy,
-        includedPaths: [
-          ...(containerDef.indexingPolicy?.includedPaths || []),
-          ...newIncludedPaths,
-        ],
-        compositeIndexes: [
-          ...(containerDef.indexingPolicy?.compositeIndexes || []),
-          ...newCompositeIndexes,
-        ],
-      };
-
-      await client()
-        .database(databaseId)
-        .container(containerId)
-        .replace({
-          id: containerId,
-          partitionKey: containerDef.partitionKey,
-          indexingPolicy: updatedPolicy,
-        });
-
-      const newIncluded = [...included, ...notIncluded.filter(item =>
-        selectedIndexes.find(s => s.index === item.index)
-      )];
-      const newNotIncluded = notIncluded.filter(item =>
-        !selectedIndexes.find(s => s.index === item.index)
-      );
-
-      setSelectedIndexes([]);
-      setSelectAll(false);
-      setIndexMetricsFromParsed(newIncluded, newNotIncluded);
-      setUpdateMessageShown(true);
-    } catch (err) {
-      console.error("Failed to update indexing policy:", err);
-    }
-  };
-
-  const setIndexMetricsFromParsed = (included: { index: string; impact: string }[], notIncluded: { index: string; impact: string }[]) => {
-    const serialize = (sectionTitle: string, items: { index: string; impact: string }[], isUtilized: boolean) =>
-      items.length
-        ? `${sectionTitle}\n` +
-        items
-          .map((item) => `Index Spec: ${item.index}\nIndex Impact Score: ${item.impact}`)
-          .join("\n") + "\n"
-        : "";
-    const composedMetrics =
-      serialize("Utilized Single Indexes", included, true) +
-      serialize("Potential Single Indexes", notIncluded, false);
-
-    setIndexMetrics(composedMetrics.trim());
-  };
-
-  const renderImpactDots = (impact: string) => {
-    let count = 0;
-    if (impact === "High") count = 3;
-    else if (impact === "Medium") count = 2;
-    else if (impact === "Low") count = 1;
-
-    return (
-      <div style={{ display: "flex", alignItems: "center", gap: "4px" }}>
-        {Array.from({ length: count }).map((_, i) => (
-          <CircleFilled
-            key={i}
-            style={{
-              color: "#0078D4",
-              fontSize: "12px",
-              display: "inline-flex",
-            }}
-          />
-        ))}
-      </div>
-    );
-  };
-
-  const renderRow = (item: IIndexMetric, index: number) => {
-    const isHeader = item.section === "Header";
-    const isNotIncluded = item.section === "Not Included";
-    const isIncluded = item.section === "Included";
-
-    return (
-      <TableRow key={index}>
-        <TableCell colSpan={2}>
-          <div
-            style={{
-              display: "grid",
-              gridTemplateColumns: "30px 30px 1fr 50px 120px",
-              alignItems: "center",
-              gap: "8px",
-            }}>
-            {isNotIncluded ? (
-              <Checkbox
-                checked={selectedIndexes.some((selected) => selected.index === item.index)}
-                onChange={(_, data) => handleCheckboxChange(item, data.checked === true)}
-              />
-            ) : isHeader && item.index === "Not Included in Current Policy" && notIncluded.length > 0 ? (
-              <Checkbox
-                checked={selectAll}
-                onChange={(_, data) => handleSelectAll(data.checked === true)}
-              />
-            ) : (
-              <div style={{ width: "18px", height: "18px" }}></div>
-            )}
-            {isHeader ? (
-              <span
-                style={{ cursor: "pointer" }}
-                onClick={() => {
-                  if (item.index === "Included in Current Policy") {
-                    setShowIncluded(!showIncluded);
-                  } else if (item.index === "Not Included in Current Policy") {
-                    setShowNotIncluded(!showNotIncluded);
-                  }
-                }}
-              >
-                {item.index === "Included in Current Policy"
-                  ? showIncluded
-                    ? <ChevronDown20Regular />
-                    : <ChevronRight20Regular />
-                  : showNotIncluded
-                    ? <ChevronDown20Regular />
-                    : <ChevronRight20Regular />
-                }
-              </span>
-            ) : (
-              <div style={{ width: "24px" }}></div>
-            )}
-            <div style={{ fontWeight: isHeader ? "bold" : "normal" }}>
-              {item.index}
-            </div>
-            <div style={{ fontSize: isHeader ? 0 : undefined }}>
-              {isHeader ? null : item.impact}
-            </div>
-            <div>
-              {isHeader ? null : renderImpactDots(item.impact)}
-            </div>
-          </div>
-        </TableCell>
-      </TableRow>
-    );
-  };
-  const generateIndexMetricItems = (
-
-    included: { index: string; impact: string }[],
-    notIncluded: { index: string; impact: string }[]
-  ): IIndexMetric[] => {
-    const items: IIndexMetric[] = [];
-
-    items.push({ index: "Not Included in Current Policy", impact: "", section: "Header" });
-    if (showNotIncluded) {
-      notIncluded.forEach((item) =>
-        items.push({ ...item, section: "Not Included" })
-      );
-    }
-    items.push({ index: "Included in Current Policy", impact: "", section: "Header" });
-    if (showIncluded) {
-      included.forEach((item) =>
-        items.push({ ...item, section: "Included" })
-      );
-    }
-    return items;
-  };
-
-  if (loading) {
-    return <div>
-      <Spinner
-        size="small"
-        style={{
-          '--spinner-size': '16px',
-          '--spinner-thickness': '2px',
-          '--spinner-color': '#0078D4',
-        } as React.CSSProperties} />
-    </div>;
-  }
-
-  return (
-    <div>
-      <div style={{ padding: "1rem", fontSize: "1.2rem", display: "flex", alignItems: "center", gap: "0.5rem" }}>
-        {updateMessageShown ? (
-          <>
-            <span
-              style={{
-                width: 18,
-                height: 18,
-                borderRadius: "50%",
-                backgroundColor: "#107C10",
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "center",
-              }}>
-              <FontIcon iconName="CheckMark" style={{ color: "white", fontSize: 12 }} />
-            </span>
-            <span>
-              Your indexing policy has been updated with the new included paths. You may review the changes in Scale & Settings.
-            </span>
-          </>
-        ) : (
-          "Here is an analysis on the indexes utilized for executing the query. Based on the analysis, Cosmos DB recommends adding the selected indexes to your indexing policy to optimize the performance of this particular query."
-        )}
-      </div>
-      <div style={{ padding: "1rem", fontSize: "1.3rem", fontWeight: "bold" }}>Indexes analysis</div>
-      <Table style={{ display: "block", alignItems: "center", marginBottom: "7rem" }}>
-        <TableHeader>
-          <TableRow >
-            <TableCell colSpan={2}>
-              <div
-                style={{
-                  display: "grid",
-                  gridTemplateColumns: "30px 30px 1fr 50px 120px",
-                  alignItems: "center",
-                  gap: "8px",
-                  fontWeight: "bold",
-                }}
-              >
-                <div style={{ width: "18px", height: "18px" }}></div>
-                <div style={{ width: "24px" }}></div>
-                <div>Index</div>
-                <div><span style={{ whiteSpace: "nowrap" }}>Estimated Impact</span></div>
-              </div>
-            </TableCell>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {generateIndexMetricItems(included, notIncluded).map(renderRow)}
-        </TableBody>
-      </Table>
-      {selectedIndexes.length > 0 && (
-        <div style={{ padding: "1rem", marginTop: "-7rem", flexWrap: "wrap" }}>
-          <button
-            onClick={handleUpdatePolicy}
-            style={{
-              backgroundColor: "#0078D4",
-              color: "white",
-              padding: "8px 16px",
-              border: "none",
-              borderRadius: "4px",
-              cursor: "pointer",
-              marginTop: "1rem",
-            }}
-          >
-            Update Indexing Policy with selected index(es)
-          </button>
-        </div>
-      )}
-    </div>
-  );
-};
 export const ResultsView: React.FC<ResultsViewProps> = ({ isMongoDB, queryResults, executeQueryDocumentsPage }) => {
  const styles = useQueryTabStyles();
  const [activeTab, setActiveTab] = useState<ResultsTabs>(ResultsTabs.Results);
@@ -947,13 +380,6 @@ export const ResultsView: React.FC<ResultsViewProps> = ({ isMongoDB, queryResult
        >
          Query Stats
        </Tab>
-        <Tab
-          data-test="QueryTab/ResultsPane/ResultsView/IndexAdvisorTab"
-          id={ResultsTabs.IndexAdvisor}
-          value={ResultsTabs.IndexAdvisor}
-        >
-          Index Advisor
-        </Tab>
      </TabList>
      <div className={styles.queryResultsTabContentContainer}>
        {activeTab === ResultsTabs.Results && (
@@ -964,7 +390,6 @@ export const ResultsView: React.FC<ResultsViewProps> = ({ isMongoDB, queryResult
          />
        )}
        {activeTab === ResultsTabs.QueryStats && <QueryStatsTab queryResults={queryResults} />}
-        {activeTab === ResultsTabs.IndexAdvisor && <IndexAdvisorTab />}
      </div>
    </div>
  );
--- a/src/Explorer/Tabs/QueryTab/Styles.ts
+++ b/src/Explorer/Tabs/QueryTab/Styles.ts
@@ -25,9 +25,6 @@ export const useQueryTabStyles = makeStyles({
    height: "100%",
    display: "flex",
    flexDirection: "column",
-    "@media (max-width: 420px)": {
-      overflow: "scroll",
-    },
  },
  queryResultsMessage: {
    ...shorthands.margin("5px"),
@@ -41,9 +38,6 @@ export const useQueryTabStyles = makeStyles({
    display: "flex",
    rowGap: "12px",
    flexDirection: "column",
-    "@media (max-width: 420px)": {
-      height: "auto",
-    },
  },
  queryResultsTabContentContainer: {
    display: "flex",
@@ -99,12 +93,4 @@ export const useQueryTabStyles = makeStyles({
    display: "flex",
    flexDirection: "row",
  },
-  responsiveImg: {
-    "@media (max-width: 420px)": {
-      width: "50px",
-    },
-  },
-  zoomedImageSize: {
-    width: "60px",
-  },
 });
--- a/src/Explorer/Tabs/QueryTab/useQueryMetadataStore.ts
+++ b/src/Explorer/Tabs/QueryTab/useQueryMetadataStore.ts
@@ -1,16 +0,0 @@
-import create from "zustand";
-
-interface QueryMetadataStore {
-  userQuery: string;
-  databaseId: string;
-  containerId: string;
-  setMetadata: (query1: string, db: string, container: string) => void;
-}
-
-export const useQueryMetadataStore = create<QueryMetadataStore>((set) => ({
-  userQuery: "",
-  databaseId: "",
-  containerId: "",
-  setMetadata: (query1, db, container) =>
-    set({ userQuery: query1, databaseId: db, containerId: container }),
-}));
--- a/src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx
+++ b/src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx
@@ -1,62 +0,0 @@
-import { Spinner, SpinnerSize } from "@fluentui/react";
-import { MessageTypes } from "Contracts/ExplorerContracts";
-import { QuickstartFirewallNotification } from "Explorer/Quickstart/QuickstartFirewallNotification";
-import { getShellNameForDisplay } from "Explorer/Tabs/CloudShellTab/Utils/CommonUtils";
-import * as React from "react";
-import FirewallRuleScreenshot from "../../../../images/firewallRule.png";
-import VcoreFirewallRuleScreenshot from "../../../../images/vcoreMongoFirewallRule.png";
-import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
-import * as DataModels from "../../../Contracts/DataModels";
-import * as ViewModels from "../../../Contracts/ViewModels";
-
-/**
- * Base terminal component adapter
- */
-export abstract class BaseTerminalComponentAdapter implements ReactAdapter {
-  // parameters: true: show, false: hide
-  public parameters: ko.Computed<boolean>;
-
-  constructor(
-    protected getDatabaseAccount: () => DataModels.DatabaseAccount,
-    protected getTabId: () => string,
-    protected getUsername: () => string,
-    protected isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
-    protected kind: ViewModels.TerminalKind,
-  ) {}
-
-  public renderComponent(): JSX.Element {
-    if (!this.isAllPublicIPAddressesEnabled()) {
-      return (
-        <QuickstartFirewallNotification
-          messageType={this.getMessageType()}
-          screenshot={
-            this.kind === ViewModels.TerminalKind.Mongo || this.kind === ViewModels.TerminalKind.VCoreMongo
-              ? VcoreFirewallRuleScreenshot
-              : FirewallRuleScreenshot
-          }
-          shellName={getShellNameForDisplay(this.kind)}
-        />
-      );
-    }
-
-    return this.parameters() ? (
-      this.renderTerminalComponent()
-    ) : (
-      <Spinner styles={{ root: { marginTop: 10 } }} size={SpinnerSize.large}></Spinner>
-    );
-  }
-
-  private getMessageType(): MessageTypes {
-    switch (this.kind) {
-      case ViewModels.TerminalKind.Postgres:
-        return MessageTypes.OpenPostgresNetworkingBlade;
-      case ViewModels.TerminalKind.Mongo:
-      case ViewModels.TerminalKind.VCoreMongo:
-        return MessageTypes.OpenVCoreMongoNetworkingBlade;
-      default:
-        return MessageTypes.OpenPostgresNetworkingBlade;
-    }
-  }
-
-  protected abstract renderTerminalComponent(): JSX.Element;
-}
--- a/src/Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter.tsx
+++ b/src/Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter.tsx
@@ -1,19 +0,0 @@
-import { CloudShellTerminalComponent } from "Explorer/Tabs/CloudShellTab/CloudShellTerminalComponent";
-import * as React from "react";
-import { BaseTerminalComponentAdapter } from "./BaseTerminalComponentAdapter";
-
-/**
- * CloudShell terminal tab
- */
-export class CloudShellTerminalComponentAdapter extends BaseTerminalComponentAdapter {
-  protected renderTerminalComponent(): JSX.Element {
-    return (
-      <CloudShellTerminalComponent
-        databaseAccount={this.getDatabaseAccount()}
-        tabId={this.getTabId()}
-        shellType={this.kind}
-        username={this.getUsername()}
-      />
-    );
-  }
-}
--- a/src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx
+++ b/src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx
@@ -1,32 +0,0 @@
-import { NotebookTerminalComponent } from "Explorer/Controls/Notebook/NotebookTerminalComponent";
-import * as React from "react";
-import * as DataModels from "../../../Contracts/DataModels";
-import * as ViewModels from "../../../Contracts/ViewModels";
-import { BaseTerminalComponentAdapter } from "./BaseTerminalComponentAdapter";
-
-/**
- * Notebook terminal tab
- */
-export class NotebookTerminalComponentAdapter extends BaseTerminalComponentAdapter {
-  constructor(
-    private getNotebookServerInfo: () => DataModels.NotebookWorkspaceConnectionInfo,
-    getDatabaseAccount: () => DataModels.DatabaseAccount,
-    getTabId: () => string,
-    getUsername: () => string,
-    isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
-    kind: ViewModels.TerminalKind,
-  ) {
-    super(getDatabaseAccount, getTabId, getUsername, isAllPublicIPAddressesEnabled, kind);
-  }
-
-  protected renderTerminalComponent(): JSX.Element {
-    return (
-      <NotebookTerminalComponent
-        notebookServerInfo={this.getNotebookServerInfo()}
-        databaseAccount={this.getDatabaseAccount()}
-        tabId={this.getTabId()}
-        username={this.getUsername()}
-      />
-    );
-  }
-}
--- a/src/Explorer/Tabs/Tabs.tsx
+++ b/src/Explorer/Tabs/Tabs.tsx
@@ -18,7 +18,6 @@ import React, { MutableRefObject, useEffect, useRef, useState } from "react";
 import loadingIcon from "../../../images/circular_loader_black_16x16.gif";
 import errorIcon from "../../../images/close-black.svg";
 import errorQuery from "../../../images/error_no_outline.svg";
-import warningIconSvg from "../../../images/warning.svg";
 import { useObservable } from "../../hooks/useObservable";
 import { ReactTabKind, useTabs } from "../../hooks/useTabs";
 import TabsBase from "./TabsBase";
@@ -118,9 +117,6 @@ function TabNav({ tab, active, tabKind }: { tab?: Tab; active: boolean; tabKind?
          >
            <span className="statusIconContainer" style={{ width: tabKind === ReactTabKind.Home ? 0 : 18 }}>
              {useObservable(tab?.isExecutionError || ko.observable(false)) && <ErrorIcon tab={tab} active={active} />}
-              {useObservable(tab?.isExecutionWarning || ko.observable(false)) && (
-                <WarningIcon tab={tab} active={active} />
-              )}
              {isTabExecuting(tab, tabKind) && (
                <img className="loadingIcon" title="Loading" src={loadingIcon} alt="Loading" />
              )}
@@ -198,20 +194,6 @@ const ErrorIcon = ({ tab, active }: { tab: Tab; active: boolean }) => (
  </div>
 );

-const WarningIcon = ({ tab, active }: { tab: Tab; active: boolean }) => (
-  <div
-    id="warningStatusIcon"
-    role="button"
-    title="Click to view more details"
-    tabIndex={active ? 0 : undefined}
-    className={active ? "actionsEnabled warningIconContainer" : "warningIconContainer"}
-    onClick={({ nativeEvent: e }) => tab.onErrorDetailsClick(undefined, e)}
-    onKeyPress={({ nativeEvent: e }) => tab.onErrorDetailsKeyPress(undefined, e)}
-  >
-    <img src={warningIconSvg} alt="Warning Icon" style={{ height: 15, marginBottom: 5 }} />
-  </div>
-);
-
 function TabPane({ tab, active }: { tab: Tab; active: boolean }) {
  const ref = useRef<HTMLDivElement>();
  const attrs = {
--- a/src/Explorer/Tabs/TabsBase.ts
+++ b/src/Explorer/Tabs/TabsBase.ts
@@ -27,7 +27,6 @@ export default class TabsBase extends WaitsForTemplateViewModel {
  public tabTitle: ko.Observable<string>;
  public tabPath: ko.Observable<string>;
  public isExecutionError = ko.observable(false);
-  public isExecutionWarning = ko.observable(false);
  public isExecuting = ko.observable(false);
  protected _theme: string;
  public onLoadStartKey: number;
--- a/src/Explorer/Tabs/TerminalTab.tsx
+++ b/src/Explorer/Tabs/TerminalTab.tsx
@@ -1,14 +1,19 @@
+import { Spinner, SpinnerSize } from "@fluentui/react";
+import { MessageTypes } from "Contracts/ExplorerContracts";
+import { QuickstartFirewallNotification } from "Explorer/Quickstart/QuickstartFirewallNotification";
 import { checkFirewallRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
-import { CloudShellTerminalComponentAdapter } from "Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter";
 import * as ko from "knockout";
+import * as React from "react";
+import FirewallRuleScreenshot from "../../../images/firewallRule.png";
+import VcoreFirewallRuleScreenshot from "../../../images/vcoreMongoFirewallRule.png";
 import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { userContext } from "../../UserContext";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
+import { NotebookTerminalComponent } from "../Controls/Notebook/NotebookTerminalComponent";
 import Explorer from "../Explorer";
 import { useNotebook } from "../Notebook/useNotebook";
-import { NotebookTerminalComponentAdapter } from "./ShellAdapters/NotebookTerminalComponentAdapter";
 import TabsBase from "./TabsBase";

 export interface TerminalTabOptions extends ViewModels.TabOptions {
@@ -18,52 +23,90 @@ export interface TerminalTabOptions extends ViewModels.TabOptions {
  username?: string;
 }

+/**
+ * Notebook terminal tab
+ */
+class NotebookTerminalComponentAdapter implements ReactAdapter {
+  // parameters: true: show, false: hide
+  public parameters: ko.Computed<boolean>;
+  constructor(
+    private getNotebookServerInfo: () => DataModels.NotebookWorkspaceConnectionInfo,
+    private getDatabaseAccount: () => DataModels.DatabaseAccount,
+    private getTabId: () => string,
+    private getUsername: () => string,
+    private isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
+    private kind: ViewModels.TerminalKind,
+  ) {}
+
+  public renderComponent(): JSX.Element {
+    if (!this.isAllPublicIPAddressesEnabled()) {
+      return (
+        <QuickstartFirewallNotification
+          messageType={MessageTypes.OpenPostgresNetworkingBlade}
+          screenshot={
+            this.kind === ViewModels.TerminalKind.Mongo || this.kind === ViewModels.TerminalKind.VCoreMongo
+              ? VcoreFirewallRuleScreenshot
+              : FirewallRuleScreenshot
+          }
+          shellName={this.getShellNameForDisplay(this.kind)}
+        />
+      );
+    }
+
+    return this.parameters() ? (
+      <NotebookTerminalComponent
+        notebookServerInfo={this.getNotebookServerInfo()}
+        databaseAccount={this.getDatabaseAccount()}
+        tabId={this.getTabId()}
+        username={this.getUsername()}
+      />
+    ) : (
+      <Spinner styles={{ root: { marginTop: 10 } }} size={SpinnerSize.large}></Spinner>
+    );
+  }
+
+  private getShellNameForDisplay(terminalKind: ViewModels.TerminalKind): string {
+    switch (terminalKind) {
+      case ViewModels.TerminalKind.Postgres:
+        return "PostgreSQL";
+      case ViewModels.TerminalKind.Mongo:
+      case ViewModels.TerminalKind.VCoreMongo:
+        return "MongoDB";
+      default:
+        return "";
+    }
+  }
+}
+
 export default class TerminalTab extends TabsBase {
  public readonly html = '<div style="height: 100%" data-bind="react:notebookTerminalComponentAdapter"></div>  ';
  private container: Explorer;
-  private notebookTerminalComponentAdapter: ReactAdapter;
+  private notebookTerminalComponentAdapter: NotebookTerminalComponentAdapter;
  private isAllPublicIPAddressesEnabled: ko.Observable<boolean>;

  constructor(options: TerminalTabOptions) {
    super(options);
    this.container = options.container;
    this.isAllPublicIPAddressesEnabled = ko.observable(true);
-
-    const commonArgs: [
-      () => DataModels.DatabaseAccount,
-      () => string,
-      () => string,
-      ko.Observable<boolean>,
-      ViewModels.TerminalKind,
-    ] = [
+    this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
+      () => this.getNotebookServerInfo(options),
      () => userContext?.databaseAccount,
      () => this.tabId,
      () => this.getUsername(),
      this.isAllPublicIPAddressesEnabled,
      options.kind,
-    ];
-
-    if (userContext.features.enableCloudShell) {
-      this.notebookTerminalComponentAdapter = new CloudShellTerminalComponentAdapter(...commonArgs);
-
-      this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
-        return this.isTemplateReady() && this.isAllPublicIPAddressesEnabled();
-      });
-    } else {
-      this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
-        () => this.getNotebookServerInfo(options),
-        ...commonArgs,
-      );
-
-      this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
-        return (
-          this.isTemplateReady() &&
-          useNotebook.getState().isNotebookEnabled &&
-          useNotebook.getState().notebookServerInfo?.notebookServerEndpoint &&
-          this.isAllPublicIPAddressesEnabled()
-        );
-      });
-    }
+    );
+    this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
+      if (
+        this.isTemplateReady() &&
+        useNotebook.getState().isNotebookEnabled &&
+        useNotebook.getState().notebookServerInfo?.notebookServerEndpoint &&
+        this.isAllPublicIPAddressesEnabled()
+      ) {
+        return true;
+      }
+      return false;
+    });

    if (options.kind === ViewModels.TerminalKind.Postgres) {
      checkFirewallRules(
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -21,7 +21,7 @@ import { readTriggers } from "../../Common/dataAccess/readTriggers";
 import { readUserDefinedFunctions } from "../../Common/dataAccess/readUserDefinedFunctions";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
-import { BulkInsertResult, UploadDetailsRecord } from "../../Contracts/ViewModels";
+import { UploadDetailsRecord } from "../../Contracts/ViewModels";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
@@ -1092,13 +1092,17 @@ export default class Collection implements ViewModels.Collection {
    });
  }

-  public async bulkInsertDocuments(documents: JSONObject[]): Promise<BulkInsertResult> {
-    const stats: BulkInsertResult = {
+  public async bulkInsertDocuments(documents: JSONObject[]): Promise<{
+    numSucceeded: number;
+    numFailed: number;
+    numThrottled: number;
+    errors: string[];
+  }> {
+    const stats = {
      numSucceeded: 0,
      numFailed: 0,
      numThrottled: 0,
      errors: [] as string[],
-      resources: [],
    };

    const chunkSize = 100; // 100 is the max # of bulk operations the SDK currently accepts
@@ -1116,12 +1120,8 @@ export default class Collection implements ViewModels.Collection {
        responses.forEach((response, index) => {
          if (response.statusCode === 201) {
            stats.numSucceeded++;
-            stats.resources.push(response.resourceBody);
          } else if (response.statusCode === 429) {
            documentsToAttempt.push(attemptedDocuments[index]);
-          } else if (response.statusCode === 409) {
-            stats.numFailed++;
-            stats.errors.push(`Document with id ${attemptedDocuments[index].id} already exists.`);
          } else {
            stats.numFailed++;
            stats.errors.push(JSON.stringify(response.resourceBody));
@@ -1149,22 +1149,18 @@ export default class Collection implements ViewModels.Collection {
      numFailed: 0,
      numThrottled: 0,
      errors: [],
-      resources: [],
    };

    try {
      const parsedContent = JSON.parse(documentContent);
      if (Array.isArray(parsedContent)) {
-        const { numSucceeded, numFailed, numThrottled, errors, resources } =
-          await this.bulkInsertDocuments(parsedContent);
+        const { numSucceeded, numFailed, numThrottled, errors } = await this.bulkInsertDocuments(parsedContent);
        record.numSucceeded = numSucceeded;
        record.numFailed = numFailed;
        record.numThrottled = numThrottled;
        record.errors = errors;
-        record.resources = record.resources.concat(resources);
      } else {
-        const resource = await createDocument(this, parsedContent);
-        record.resources.push(resource);
+        await createDocument(this, parsedContent);
        record.numSucceeded++;
      }

--- a/src/Explorer/Tree/treeNodeUtil.tsx
+++ b/src/Explorer/Tree/treeNodeUtil.tsx
@@ -6,7 +6,7 @@ import StoredProcedure from "Explorer/Tree/StoredProcedure";
 import Trigger from "Explorer/Tree/Trigger";
 import UserDefinedFunction from "Explorer/Tree/UserDefinedFunction";
 import { useDatabases } from "Explorer/useDatabases";
-import { isFabric, isFabricMirrored, isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
+import { isFabric, isFabricMirrored, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { getItemName } from "Utils/APITypeUtils";
 import { isServerlessAccount } from "Utils/CapabilityUtils";
 import { useTabs } from "hooks/useTabs";
@@ -292,7 +292,7 @@ const buildCollectionNodeChildren = (
    contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(container, collection),
  });

-  if ((userContext.apiType !== "Cassandra" || !isServerlessAccount()) && !isFabricNativeReadOnly()) {
+  if (userContext.apiType !== "Cassandra" || !isServerlessAccount()) {
    let id = "";
    if (collection.isSampleCollection) {
      id = database.isDatabaseShared() ? "sampleSettings" : "sampleScaleSettings";
--- a/src/Platform/Fabric/FabricUtil.ts
+++ b/src/Platform/Fabric/FabricUtil.ts
@@ -136,4 +136,3 @@ export const isFabricMirroredAAD = (): boolean =>
 export const isFabricMirrored = (): boolean => isFabricMirroredKey() || isFabricMirroredAAD();
 export const isFabricNative = (): boolean =>
  isFabric() && userContext.fabricContext?.artifactType === CosmosDbArtifactType.NATIVE;
-export const isFabricNativeReadOnly = (): boolean => isFabricNative() && !!userContext.fabricContext?.isReadOnly;
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -39,7 +39,6 @@ export type Features = {
  readonly copilotChatFixedMonacoEditorHeight: boolean;
  readonly enablePriorityBasedExecution: boolean;
  readonly disableConnectionStringLogin: boolean;
-  readonly enableCloudShell: boolean;

  // can be set via both flight and feature flag
  autoscaleDefault: boolean;
@@ -111,7 +110,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    copilotChatFixedMonacoEditorHeight: "true" === get("copilotchatfixedmonacoeditorheight"),
    enablePriorityBasedExecution: "true" === get("enableprioritybasedexecution"),
    disableConnectionStringLogin: "true" === get("disableconnectionstringlogin"),
-    enableCloudShell: "true" === get("enablecloudshell"),
  };
 }

--- a/src/Shared/StorageUtility.ts
+++ b/src/Shared/StorageUtility.ts
@@ -21,7 +21,6 @@ export enum StorageKey {
  DatabaseAccountId,
  EncryptedKeyToken,
  IsCrossPartitionQueryEnabled,
-  QueryControlEnabled,
  MaxDegreeOfParellism,
  IsGraphAutoVizDisabled,
  TenantId,
--- a/src/Shared/Telemetry/TelemetryConstants.ts
+++ b/src/Shared/Telemetry/TelemetryConstants.ts
@@ -89,7 +89,6 @@ export enum Action {
  PhoenixDBAccountAllowed,
  DeleteCellFromMenu,
  OpenTerminal,
-  OpenCloudShellTerminal,
  CreateMongoCollectionWithWildcardIndex,
  ClickCommandBarButton,
  RefreshResourceTreeMyNotebooks,
@@ -147,9 +146,6 @@ export enum Action {
  SavePersistedTabState,
  DeletePersistedTabState,
  UploadDocuments, // Used in Fabric. Please do not rename.
-  CloudShellUserConsent,
-  CloudShellTerminalSession,
-  OpenVSCode,
 }

 export const ActionModifiers = {
--- a/src/UserContext.ts
+++ b/src/UserContext.ts
@@ -117,7 +117,6 @@ export interface UserContext {
  readonly feedbackPolicies?: AdminFeedbackPolicySettings;
  readonly dataPlaneRbacEnabled?: boolean;
  readonly refreshCosmosClient?: boolean;
-  throughputBucketsEnabled?: boolean;
 }

 export type ApiType = "SQL" | "Mongo" | "Gremlin" | "Tables" | "Cassandra" | "Postgres" | "VCoreMongo";
--- a/src/Utils/CapabilityUtils.ts
+++ b/src/Utils/CapabilityUtils.ts
@@ -20,3 +20,7 @@ export const isServerlessAccount = (): boolean => {
 export const isVectorSearchEnabled = (): boolean => {
  return userContext.apiType === "SQL" && isCapabilityEnabled(Constants.CapabilityNames.EnableNoSQLVectorSearch);
 };
+
+export const isFullTextSearchEnabled = (): boolean => {
+  return userContext.apiType === "SQL" && isCapabilityEnabled(Constants.CapabilityNames.EnableNoSQLFullTextSearch);
+};
--- a/src/Utils/FeatureRegistrationUtils.ts
+++ b/src/Utils/FeatureRegistrationUtils.ts
@@ -1,48 +0,0 @@
-import { configContext } from "ConfigContext";
-import { FeatureRegistration } from "Contracts/DataModels";
-import { AuthorizationTokenHeaderMetadata } from "Contracts/ViewModels";
-import { getAuthorizationHeader } from "Utils/AuthorizationUtils";
-
-export const featureRegistered = async (subscriptionId: string, feature: string) => {
-  const api_version = "2021-07-01";
-  const url = `${configContext.ARM_ENDPOINT}/subscriptions/${subscriptionId}/providers/Microsoft.Features/featureProviders/Microsoft.DocumentDB/subscriptionFeatureRegistrations/${feature}?api-version=${api_version}`;
-  const authorizationHeader: AuthorizationTokenHeaderMetadata = getAuthorizationHeader();
-  const headers = { [authorizationHeader.header]: authorizationHeader.token };
-
-  let response;
-
-  try {
-    response = await _fetchWithTimeout(url, headers);
-  } catch (error) {
-    return false;
-  }
-
-  if (!response?.ok) {
-    return false;
-  }
-
-  const featureRegistration = (await response?.json()) as FeatureRegistration;
-  return featureRegistration?.properties?.state === "Registered";
-};
-
-async function _fetchWithTimeout(
-  url: string,
-  headers: {
-    [x: string]: string;
-  },
-) {
-  const timeout = 10000;
-  const options = { timeout };
-
-  const controller = new AbortController();
-  const id = setTimeout(() => controller.abort(), timeout);
-
-  const response = await window.fetch(url, {
-    headers,
-    ...options,
-    signal: controller.signal,
-  });
-  clearTimeout(id);
-
-  return response;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sung-Hyun Kang	b585cdddb4	Fix merge conflicts	2025-04-30 09:11:57 -05:00
Sung-Hyun Kang	6b8998eeaf	Set shards to 12 and workers to 3	2025-04-30 09:11:19 -05:00
Sung-Hyun Kang	f3b582a911	Fix pipeline errors	2025-04-30 09:10:50 -05:00
Sung-Hyun Kang	7d6efe8e2e	Fix E2E Testing	2025-04-30 09:10:47 -05:00
Sung-Hyun Kang	c51fd8bec0	Rebase master	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	c1d5641c60	Set shards to 12 and workers to 3	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	fa8c4462e8	Increase shard to 16	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	97055ccbf1	Updated github actions login to v2	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	9cbae73f58	Fix test	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	589adccd1d	Moved the az login later and updated test snap	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	5ad5c5f398	Fix pipeline errors	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	12b8523a0a	Fix E2E Testing	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	003db031ea	Show system partition key value and add test cases	2025-04-30 09:09:37 -05:00
Sung-Hyun Kang	68c42fb361	Show system partition key value and add test cases	2025-04-30 09:09:36 -05:00
Sung-Hyun Kang	b13517f218	Rebase master	2025-04-28 22:08:28 -05:00
Sung-Hyun Kang	ad481b7c2c	Rebase master	2025-04-28 22:08:05 -05:00
Sung-Hyun Kang	ab27e2fb11	Set shards to 12 and workers to 3	2025-04-28 22:06:56 -05:00
Sung-Hyun Kang	f678a66d5c	Increase shard to 16	2025-04-28 22:06:56 -05:00
Sung-Hyun Kang	1fe2a311c5	Updated github actions login to v2	2025-04-28 22:06:55 -05:00
Sung-Hyun Kang	cabaa5ebed	Fix test	2025-04-28 22:06:55 -05:00
Sung-Hyun Kang	fcc98f1a5a	Moved the az login later and updated test snap	2025-04-28 22:06:55 -05:00
Sung-Hyun Kang	0f8c6bd524	Fix pipeline errors	2025-04-28 22:06:55 -05:00
Sung-Hyun Kang	92b288eee7	Fix E2E Testing	2025-04-28 22:06:55 -05:00
Sung-Hyun Kang	ed4e2f9beb	Show system partition key value and add test cases	2025-04-28 22:06:55 -05:00
Sung-Hyun Kang	0c7985ce89	Show system partition key value and add test cases	2025-04-28 22:06:54 -05:00
Sung-Hyun Kang	1f8fefb732	Set shards to 12 and workers to 3	2025-04-28 21:51:31 -05:00
Sung-Hyun Kang	41d690748b	Increase shard to 16	2025-04-28 21:33:47 -05:00
Sung-Hyun Kang	0d81d4270e	Updated github actions login to v2	2025-04-28 21:33:06 -05:00
Sung-Hyun Kang	71799d7ec5	Fix test	2025-04-28 08:52:32 -05:00
Sung-Hyun Kang	ace8aadbbd	Moved the az login later and updated test snap	2025-04-27 21:02:51 -05:00
Sung-Hyun Kang	5e4ce3dcd5	Fix pipeline errors	2025-04-27 19:21:42 -05:00
Sung-Hyun Kang	b9ed554377	Fix E2E Testing	2025-04-27 19:01:43 -05:00
Sung-Hyun Kang	5a7de7ded4	Show system partition key value and add test cases	2025-04-25 00:23:42 -05:00
Sung-Hyun Kang	bc183bafdb	Show system partition key value and add test cases	2025-04-24 23:40:05 -05:00
				`@@ -1 +0,0 @@`
				<svg width="15" height="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><defs><clipPath id="clip0"><rect x="479" y="279" width="15" height="15"/></clipPath><clipPath id="clip1"><rect x="-0.287396" y="-0.171573" width="152381" height="152381"/></clipPath><image width="35" height="35" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAH4UExURQAAAASExCGs7CC//wB9vQB5uxSU1yaz8ySy9AB8uwB8vAB5uxOR1Say8yax8iaw8gB6vAB6uwB7uwB4uROQ1Cax8ySy8QCAvwB3ugB5ugB2uROP1CWw8yav8wCT2QCQ1QCP1wB2uQB1uBOO0yWv8yat8wCP1QCP1QCP1QCO1QCQ1wB1tQB2uAB3uAB1tx+k6SSt8ySt8QCN0wCO1ACM0wBzuQBztAB1twB0tgB0tiSr8SSs8gCM1ACM1ACEywBwtQBxtAB0tgBztQB0sySp8SSr8gCL0wCK0gCL0wCHzwByuABusgBztQBttiOq8gB6wQCI0QCJ0gB7wySn8SOo8gBxtABtsABwtgCFzwCI0gCG0QCJ0SKn8SKn8iKl8QBvsABvsgBvsQBtsABssgCCzACG0QCF0ACDzyKm8QBtrwBusABsrgCAzQCE0ACF0ACF0ACE0CKj8SKl8QBssQBtrwBtrwBsrgBsrwCK1QCBzwCD0ACA0B2d7CGj8QBsrABrrQBwrwCA3wCC0ACCzwCBzwB+zhGM3iGi8SKh8QCAzQCAzgCAzwB9zRCK3iCh8SGh8SCf8QB+zAB/zgB8zRCJ3SCg8SCf7wB+zQB6zBCI3CCe8CCf8CCe8CCf8SCf/wB7zAB4yxGJ3h6c8CCd7yCf7wmA0RqX60C//5CaUeMAAACodFJOUwA8XAho+//ncID/////53iM//////9wCKv/////gCiYILf///+AMPP/70wYw/+3lP+AXP+MKNv/+3uA/3z/+////+NAgP9c9/////+7HP+A///MgP9Y+////7scgP+AeP/////7/+NA/2D/iyTb//t4gP808//vUBjD/7eU/yifIAi3//////+Ar////////4CI/////3B//////+9/CGj7/+dwEDhYBCm1XqwAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAFpSURBVDhPY2AYBaiAkYkZXQgdsLCysXPgV8XJxc3Dy8vHj0eVgKCQsIioqKioGLoMDIhLSEpKSknLyMjIyKLLyckrgJUoCgsLCyspq6ioqKiiKVFT19DUYmDQ1tEFAT19AwMDA0M0NUbGxsbGJqZm5ubm5haWDFbW1tbWVmhqGGxsbW1t7ewdHB2dnBkYXFxdXV1d0NUwuLl7eHh4enn7+DIwMLj4+fn5Yaph8A8IDAwMDBIHsYNDQkJCgtFVMISGhUdERkZGRkUzMDDExMbGxsahK4lPSExKTklNTU1NS2dgiMvIyMhAV5OZlZWVlZ2Tm5eXl5dfwFBYVFRUVIimpriktKycgaGisgoEqmtqa2tr0dUw1NU3gKjGpuaWlpbWtvb29vYOdDUw0NjZ1dXd09vX39c3AV0OASZOmjR5ytSpU6dOQ5dBAtN7ZsycNXvO3HnoEshg/oKFixYvQRdFA0uXLUcXGqEAAH4FV0z+qQbjAAAAAElFTkSuQmCC" preserveAspectRatio="none" id="img2"></image><clipPath id="clip3"><path d="M44291.4 46947.4 187148 46947.4 187148 188823 44291.4 188823Z" fill-rule="evenodd" clip-rule="evenodd"/></clipPath></defs><g clip-path="url(#clip0)" transform="translate(-479 -279)"><g clip-path="url(#clip1)" transform="matrix(0.000105 0 0 0.000105 479 279)"><g clip-path="url(#clip3)" transform="matrix(1 0 0 1.00692 -44291.4 -47272.4)"><use width="100%" height="100%" xlink:href="#img2" transform="scale(6709.45 6709.45)"></use></g></g></g></svg>