diff --git a/test/fx.ts b/test/fx.ts
index 19e61e355..f9313b6ca 100644
--- a/test/fx.ts
+++ b/test/fx.ts
@@ -63,9 +63,6 @@ export const TEST_MANUAL_THROUGHPUT_RU_2K = 2000;
 export const ONE_MINUTE_MS: number = 60 * 1000;
 
 function tryGetStandardName(accountType: TestAccount) {
-  // if (accountType === TestAccount.MongoReadonly) {
-  //   return "aisayas-e2e-mongo-readonly";
-  // }
   if (process.env.DE_TEST_ACCOUNT_PREFIX) {
     const actualPrefix = process.env.DE_TEST_ACCOUNT_PREFIX.endsWith("-")
       ? process.env.DE_TEST_ACCOUNT_PREFIX
@@ -520,15 +517,6 @@ export class DataExplorer {
     const containerNode = await this.waitForContainerNode(context.database.id, context.container.id);
     await containerNode.expand();
 
-    // // refresh tree to remove deleted database
-    // const consoleMessages = await this.getNotificationConsoleMessages();
-    // const refreshButton = this.frame.getByTestId("Sidebar/RefreshButton");
-    // await refreshButton.click();
-    // await expect(consoleMessages).toContainText("Successfully refreshed databases", {
-    //   timeout: ONE_MINUTE_MS,
-    // });
-    // await this.collapseNotificationConsole();
-
     const scaleAndSettingsButton = this.frame.getByTestId(
       `TreeNode:${context.database.id}/${context.container.id}/Scale & Settings`,
     );
diff --git a/test/mongo/document.spec.ts b/test/mongo/document.spec.ts
index 77d477404..cf98ebcc7 100644
--- a/test/mongo/document.spec.ts
+++ b/test/mongo/document.spec.ts
@@ -26,8 +26,6 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
       await documentsTab.documentsFilter.waitFor();
       await documentsTab.documentsListPane.waitFor();
       await expect(documentsTab.resultsEditor.locator).toBeAttached({ timeout: 60 * 1000 });
-
-      await explorer.expandNotificationConsole();
     });
     test.afterEach(async ({ page }) => {
       await page.unrouteAll({ behavior: "ignoreErrors" });
@@ -56,40 +54,28 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
           await expect(span).toBeVisible();
 
           await span.click();
-          // await expect(documentsTab.resultsEditor.locator).toBeAttached({ timeout: 60 * 1000 });
           await page.waitForTimeout(5000); // wait for 5 seconds to ensure document is fully loaded. waitforTimeout is not recommended generally but here we are working around flakiness in the test env
+
           let newDocumentId;
-          let retryCount = 0;
           await retry(async () => {
-            try {
-              const newDocumentButton = await explorer.waitForCommandBarButton(CommandBarButton.NewDocument, 5000);
-              await expect(newDocumentButton).toBeVisible();
-              await expect(newDocumentButton).toBeEnabled();
-              await newDocumentButton.click();
-              console.log(`DEBUG: Clicked New Document button - retryCount=${retryCount}`);
-              await expect(documentsTab.resultsEditor.locator).toBeAttached({ timeout: 60 * 1000 });
+            const newDocumentButton = await explorer.waitForCommandBarButton(CommandBarButton.NewDocument, 5000);
+            await expect(newDocumentButton).toBeVisible();
+            await expect(newDocumentButton).toBeEnabled();
+            await newDocumentButton.click();
+            await expect(documentsTab.resultsEditor.locator).toBeAttached({ timeout: 60 * 1000 });
 
-              newDocumentId = `${Date.now().toString()}-delete`;
+            newDocumentId = `${Date.now().toString()}-delete`;
 
-              const newDocument = {
-                _id: newDocumentId,
-                ...setPartitionKeys(partitionKeys || []),
-              };
+            const newDocument = {
+              _id: newDocumentId,
+              ...setPartitionKeys(partitionKeys || []),
+            };
 
-              await documentsTab.resultsEditor.setText(JSON.stringify(newDocument));
-              const saveButton = await explorer.waitForCommandBarButton(CommandBarButton.Save, 5000);
-              await saveButton.click({ timeout: 5000 });
-              console.log(`DEBUG: Clicked Save button - retryCount=${retryCount}`);
+            await documentsTab.resultsEditor.setText(JSON.stringify(newDocument));
+            const saveButton = await explorer.waitForCommandBarButton(CommandBarButton.Save, 5000);
+            await saveButton.click({ timeout: 5000 });
 
-              await expect(saveButton).toBeHidden({ timeout: 5000 });
-            } catch (err) {
-              retryCount++;
-              console.warn(
-                `DEBUG: Attempt ${retryCount} to create new document from ${docId} failed: ${(err as Error).message}`,
-              );
-
-              throw err;
-            }
+            await expect(saveButton).toBeHidden({ timeout: 5000 });
           }, 3);
 
           await documentsTab.setFilter(`{_id: "${newDocumentId}"}`);