diff --git a/src/Apps/W1/EDocument/App/Permissions/EDocCoreObjects.PermissionSet.al b/src/Apps/W1/EDocument/App/Permissions/EDocCoreObjects.PermissionSet.al
index f0ba7042ef..7ea0a55df6 100644
--- a/src/Apps/W1/EDocument/App/Permissions/EDocCoreObjects.PermissionSet.al
+++ b/src/Apps/W1/EDocument/App/Permissions/EDocCoreObjects.PermissionSet.al
@@ -43,7 +43,6 @@ permissionset 6100 "E-Doc. Core - Objects"
         table "E-Document Line Mapping" = X,
         table "E-Document Purchase Header" = X,
         table "E-Document Purchase Line" = X,
-        table "E-Documents Setup" = X,
         table "E-Document Line - Field" = X,
         table "ED Purchase Line Field Setup" = X,
         table "E-Doc Sample Purch. Inv File" = X,
diff --git a/src/Apps/W1/EDocument/App/src/Document/EDocument.Page.al b/src/Apps/W1/EDocument/App/src/Document/EDocument.Page.al
index 25339b2e03..2de7f2a557 100644
--- a/src/Apps/W1/EDocument/App/src/Document/EDocument.Page.al
+++ b/src/Apps/W1/EDocument/App/src/Document/EDocument.Page.al
@@ -311,7 +311,6 @@ page 6121 "E-Document"
                     Caption = 'View file';
                     ToolTip = 'View the source file.';
                     Image = ViewDetails;
-                    Visible = NewEDocumentExperienceActive;
 
                     trigger OnAction()
                     begin
@@ -501,14 +500,11 @@ page 6121 "E-Document"
     }
 
     trigger OnOpenPage()
-    var
-        EDocumentsSetup: Record "E-Documents Setup";
     begin
         ShowMapToOrder := false;
         HasErrorsOrWarnings := false;
         HasErrors := false;
         IsProcessed := false;
-        NewEDocumentExperienceActive := EDocumentsSetup.IsNewEDocumentExperienceActive();
 
         if Rec."Entry No" <> 0 then
             Rec.SetRecFilter(); // Filter the record to only this instance to avoid navigation 
@@ -639,7 +635,6 @@ page 6121 "E-Document"
         EDocumentErrorHelper: Codeunit "E-Document Error Helper";
         EDocumentHelper: Codeunit "E-Document Processing";
         ErrorsAndWarningsNotification: Notification;
-        NewEDocumentExperienceActive: Boolean;
         ShowClearanceInfo: Boolean;
         RecordLinkTxt, StyleStatusTxt : Text;
         ShowRelink, ShowMapToOrder, HasErrorsOrWarnings, HasErrors, IsIncomingDoc, IsProcessed, SubmitClearanceVisible : Boolean;
diff --git a/src/Apps/W1/EDocument/App/src/Document/EDocuments.Page.al b/src/Apps/W1/EDocument/App/src/Document/EDocuments.Page.al
index 1013ece46f..baf27df18f 100644
--- a/src/Apps/W1/EDocument/App/src/Document/EDocuments.Page.al
+++ b/src/Apps/W1/EDocument/App/src/Document/EDocuments.Page.al
@@ -97,7 +97,6 @@ page 6122 "E-Documents"
                 Caption = 'View file';
                 ToolTip = 'View the source file.';
                 Image = ViewDetails;
-                Visible = NewEDocumentExperienceActive;
 
                 trigger OnAction()
                 begin
@@ -111,7 +110,6 @@ page 6122 "E-Documents"
             {
                 Caption = 'Inbound';
                 ToolTip = 'View inbound electronic documents.';
-                Visible = NewEDocumentExperienceActive;
                 RunObject = Page "Inbound E-Documents";
                 RunPageMode = View;
                 Image = InwardEntry;
@@ -120,7 +118,6 @@ page 6122 "E-Documents"
             {
                 Caption = 'Outbound';
                 ToolTip = 'View outbound electronic documents.';
-                Visible = NewEDocumentExperienceActive;
                 RunObject = Page "Outbound E-Documents";
                 Image = OutboundEntry;
             }
@@ -135,16 +132,6 @@ page 6122 "E-Documents"
         }
     }
 
-    var
-        NewEDocumentExperienceActive: Boolean;
-
-    trigger OnOpenPage()
-    var
-        EDocumentsSetup: Record "E-Documents Setup";
-    begin
-        NewEDocumentExperienceActive := EDocumentsSetup.IsNewEDocumentExperienceActive();
-    end;
-
     local procedure NewFromFile()
     var
         EDocument: Record "E-Document";
diff --git a/src/Apps/W1/EDocument/App/src/Document/EDocumentsSetup.Table.al b/src/Apps/W1/EDocument/App/src/Document/EDocumentsSetup.Table.al
index 34fc6c1358..5be8f4a670 100644
--- a/src/Apps/W1/EDocument/App/src/Document/EDocumentsSetup.Table.al
+++ b/src/Apps/W1/EDocument/App/src/Document/EDocumentsSetup.Table.al
@@ -1,3 +1,5 @@
+#if not CLEANSCHEMA31
+#pragma warning disable AS0105
 // ------------------------------------------------------------------------------------------------
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
@@ -13,6 +15,9 @@ table 6107 "E-Documents Setup"
     InherentEntitlements = RIX;
     InherentPermissions = RX;
     ReplicateData = false;
+    ObsoleteReason = 'This table is obsolete and should not be used.';
+    ObsoleteState = Pending;
+    ObsoleteTag = '28.0';
 
     fields
     {
@@ -105,4 +110,6 @@ table 6107 "E-Documents Setup"
         Rec.Insert();
     end;
 
-}
\ No newline at end of file
+}
+#pragma warning restore AS0105
+#endif
\ No newline at end of file
diff --git a/src/Apps/W1/EDocument/App/src/Document/Inbound/InboundEDocFactbox.Page.al b/src/Apps/W1/EDocument/App/src/Document/Inbound/InboundEDocFactbox.Page.al
index 33c702e9fb..46ef84290d 100644
--- a/src/Apps/W1/EDocument/App/src/Document/Inbound/InboundEDocFactbox.Page.al
+++ b/src/Apps/W1/EDocument/App/src/Document/Inbound/InboundEDocFactbox.Page.al
@@ -144,10 +144,9 @@ page 6108 "Inbound E-Doc. Factbox"
     trigger OnOpenPage()
     var
         EDocument: Record "E-Document";
-        EDocumentsSetup: Record "E-Documents Setup";
     begin
         if EDocument.Get(Rec."E-Document Entry No") then;
-        ImportProcessingStatusVisible := EDocumentsSetup.IsNewEDocumentExperienceActive() and (EDocument.GetEDocumentService().GetImportProcessVersion() = Enum::"E-Document Import Process"::"Version 2.0");
+        ImportProcessingStatusVisible := EDocument.GetEDocumentService().GetImportProcessVersion() = Enum::"E-Document Import Process"::"Version 2.0";
     end;
 
     trigger OnAfterGetCurrRecord()
diff --git a/src/Apps/W1/EDocument/App/src/Document/Inbound/InboundEDocuments.Page.al b/src/Apps/W1/EDocument/App/src/Document/Inbound/InboundEDocuments.Page.al
index 5fac841168..c870f71fe0 100644
--- a/src/Apps/W1/EDocument/App/src/Document/Inbound/InboundEDocuments.Page.al
+++ b/src/Apps/W1/EDocument/App/src/Document/Inbound/InboundEDocuments.Page.al
@@ -460,14 +460,6 @@ page 6105 "Inbound E-Documents"
             AgentTaskStatus := Format(AgentTask.Status);
     end;
 
-    trigger OnOpenPage()
-    var
-        EDocumentsSetup: Record "E-Documents Setup";
-    begin
-        if not EDocumentsSetup.IsNewEDocumentExperienceActive() then
-            Error('');
-    end;
-
     #region File Upload Actions
 
     local procedure NewFromFile(Files: List of [FileUpload])
diff --git a/src/Apps/W1/EDocument/App/src/Document/Outbound/OutboundEDocuments.Page.al b/src/Apps/W1/EDocument/App/src/Document/Outbound/OutboundEDocuments.Page.al
index 0d608a5477..0b260f343c 100644
--- a/src/Apps/W1/EDocument/App/src/Document/Outbound/OutboundEDocuments.Page.al
+++ b/src/Apps/W1/EDocument/App/src/Document/Outbound/OutboundEDocuments.Page.al
@@ -98,13 +98,4 @@ page 6106 "Outbound E-Documents"
             actionref(Promoted_EDocumentServices; EDocumentServices) { }
         }
     }
-
-    trigger OnOpenPage()
-    var
-        EDocumentsSetup: Record "E-Documents Setup";
-    begin
-        if not EDocumentsSetup.IsNewEDocumentExperienceActive() then
-            Error('');
-    end;
-
 }
diff --git a/src/Apps/W1/EDocument/App/src/Processing/EDocumentSubscribers.Codeunit.al b/src/Apps/W1/EDocument/App/src/Processing/EDocumentSubscribers.Codeunit.al
index c992aa71fd..b78d6312bb 100644
--- a/src/Apps/W1/EDocument/App/src/Processing/EDocumentSubscribers.Codeunit.al
+++ b/src/Apps/W1/EDocument/App/src/Processing/EDocumentSubscribers.Codeunit.al
@@ -405,7 +405,6 @@ codeunit 6103 "E-Document Subscribers"
     begin
         DataClassificationEvalData.SetTableFieldsToNormal(Database::"E-Doc. Service Data Exch. Def.");
         DataClassificationEvalData.SetTableFieldsToNormal(Database::"E-Document");
-        DataClassificationEvalData.SetTableFieldsToNormal(Database::"E-Documents Setup");
         DataClassificationEvalData.SetTableFieldsToNormal(Database::"E-Doc. Data Storage");
         DataClassificationEvalData.SetTableFieldsToNormal(Database::"E-Document Integration Log");
         DataClassificationEvalData.SetTableFieldsToNormal(Database::"E-Document Log");
diff --git a/src/Apps/W1/EDocument/App/src/Processing/Import/Purchase/EDocumentPurchaseDraft.Page.al b/src/Apps/W1/EDocument/App/src/Processing/Import/Purchase/EDocumentPurchaseDraft.Page.al
index e1234e674b..6a3297d6e3 100644
--- a/src/Apps/W1/EDocument/App/src/Processing/Import/Purchase/EDocumentPurchaseDraft.Page.al
+++ b/src/Apps/W1/EDocument/App/src/Processing/Import/Purchase/EDocumentPurchaseDraft.Page.al
@@ -477,14 +477,11 @@ page 6181 "E-Document Purchase Draft"
 
     trigger OnOpenPage()
     var
-        EDocumentsSetup: Record "E-Documents Setup";
         EDocumentDataStorage: Record "E-Doc. Data Storage";
         EDocumentNotification: Codeunit "E-Document Notification";
         EDocPOMatching: Codeunit "E-Doc. PO Matching";
         MatchesRemovedMsg: Label 'This e-document was matched to purchase order lines, but the matches are no longer consistent with the current data. The matches have been removed';
     begin
-        if not EDocumentsSetup.IsNewEDocumentExperienceActive() then
-            Error('');
         if EDocumentPurchaseHeader.Get(Rec."Entry No") then;
         if not EDocPOMatching.IsPOMatchConsistent(EDocumentPurchaseHeader) then begin
             EDocPOMatching.RemoveAllMatchesForEDocument(EDocumentPurchaseHeader);
diff --git a/src/Apps/W1/EDocument/App/src/Service/EDocumentService.Table.al b/src/Apps/W1/EDocument/App/src/Service/EDocumentService.Table.al
index 91accb5b6e..659e2e7f86 100644
--- a/src/Apps/W1/EDocument/App/src/Service/EDocumentService.Table.al
+++ b/src/Apps/W1/EDocument/App/src/Service/EDocumentService.Table.al
@@ -356,11 +356,7 @@ table 6103 "E-Document Service"
     end;
 
     internal procedure GetImportProcessVersion(): Enum "E-Document Import Process"
-    var
-        EDocumentsSetup: Record "E-Documents Setup";
     begin
-        if not EDocumentsSetup.IsNewEDocumentExperienceActive() then
-            exit("E-Document Import Process"::"Version 1.0");
         exit(Rec."Import Process");
     end;
 
diff --git a/src/Apps/W1/EDocument/Demo Data/1.Setup Data/CreateEDocumentSetup.Codeunit.al b/src/Apps/W1/EDocument/Demo Data/1.Setup Data/CreateEDocumentSetup.Codeunit.al
index cda857139c..4f5e6aedc3 100644
--- a/src/Apps/W1/EDocument/Demo Data/1.Setup Data/CreateEDocumentSetup.Codeunit.al	
+++ b/src/Apps/W1/EDocument/Demo Data/1.Setup Data/CreateEDocumentSetup.Codeunit.al	
@@ -7,7 +7,6 @@ namespace Microsoft.eServices.EDocument.DemoData;
 using Microsoft.eServices.EDocument;
 using Microsoft.Foundation.Reporting;
 using System.Automation;
-using System.Environment;
 
 #pragma warning disable AA0247
 codeunit 5374 "Create E-Document Setup"
@@ -17,7 +16,6 @@ codeunit 5374 "Create E-Document Setup"
 
     trigger OnRun()
     begin
-        CreateEDocumentsSetupWithNewExperience();
         CreateEDocService();
         CreateWorkflow();
         CreateDocSendingProfile();
@@ -57,17 +55,6 @@ codeunit 5374 "Create E-Document Setup"
         if Workflow.Insert() then;
     end;
 
-    local procedure CreateEDocumentsSetupWithNewExperience()
-    var
-        EDocumentsSetup: Record "E-Documents Setup";
-        EnvironmentInformation: Codeunit "Environment Information";
-    begin
-        if EDocumentsSetup.IsNewEDocumentExperienceActive() then
-            exit;
-        if EnvironmentInformation.IsOnPrem() then
-            EDocumentsSetup.InsertNewExperienceSetup();
-    end;
-
     local procedure CreateEDocService()
     var
         EDocServiceRec: Record "E-Document Service";
diff --git a/src/Apps/W1/EDocument/Test/src/Processing/EDocE2ETest.Codeunit.al b/src/Apps/W1/EDocument/Test/src/Processing/EDocE2ETest.Codeunit.al
index e2fd1795d8..70f194ea57 100644
--- a/src/Apps/W1/EDocument/Test/src/Processing/EDocE2ETest.Codeunit.al
+++ b/src/Apps/W1/EDocument/Test/src/Processing/EDocE2ETest.Codeunit.al
@@ -2052,7 +2052,6 @@ codeunit 139624 "E-Doc E2E Test"
         TransformationRule: Record "Transformation Rule";
         EDocument: Record "E-Document";
         EDocumentServiceStatus: Record "E-Document Service Status";
-        EDocumentSetup: Record "E-Documents Setup";
         Vendor: Record Vendor;
         Currency: Record Currency;
         LibraryERM: Codeunit "Library - ERM";
@@ -2073,7 +2072,6 @@ codeunit 139624 "E-Doc E2E Test"
         LibraryEDoc.SetupStandardSalesScenario(Customer, EDocumentService, Enum::"E-Document Format"::Mock, Integration);
         LibraryEDoc.SetupStandardPurchaseScenario(Vendor, EDocumentService, Enum::"E-Document Format"::Mock, Integration);
         EDocumentService.Modify();
-        EDocumentSetup.InsertNewExperienceSetup();
 
         // Set a currency that can be used across all localizations
         Currency.Init();
diff --git a/src/Apps/W1/EDocument/Test/src/Processing/EDocFormatTests.Codeunit.al b/src/Apps/W1/EDocument/Test/src/Processing/EDocFormatTests.Codeunit.al
index d33eaa8327..7980fc4e21 100644
--- a/src/Apps/W1/EDocument/Test/src/Processing/EDocFormatTests.Codeunit.al
+++ b/src/Apps/W1/EDocument/Test/src/Processing/EDocFormatTests.Codeunit.al
@@ -104,7 +104,6 @@ codeunit 139519 "E-Doc. Format Tests"
         TransformationRule: Record "Transformation Rule";
         EDocument: Record "E-Document";
         EDocDataStorage: Record "E-Doc. Data Storage";
-        EDocumentsSetup: Record "E-Documents Setup";
         EDocumentServiceStatus: Record "E-Document Service Status";
         EDocPurchLineFieldSetup: Record "ED Purchase Line Field Setup";
         PurchInvHeader: Record "Purch. Inv. Header";
@@ -145,7 +144,6 @@ codeunit 139519 "E-Doc. Format Tests"
         EDocumentService."Import Process" := "E-Document Import Process"::"Version 2.0";
         EDocumentService."Read into Draft Impl." := "E-Doc. Read into Draft"::PEPPOL;
         EDocumentService.Modify();
-        EDocumentsSetup.InsertNewExperienceSetup();
 
         TransformationRule.DeleteAll();
         TransformationRule.CreateDefaultTransformations();
diff --git a/src/Apps/W1/EDocument/Test/src/Processing/EDocProcessTest.Codeunit.al b/src/Apps/W1/EDocument/Test/src/Processing/EDocProcessTest.Codeunit.al
index 25d665dc35..0acbae7a64 100644
--- a/src/Apps/W1/EDocument/Test/src/Processing/EDocProcessTest.Codeunit.al
+++ b/src/Apps/W1/EDocument/Test/src/Processing/EDocProcessTest.Codeunit.al
@@ -654,7 +654,6 @@ codeunit 139883 "E-Doc Process Test"
         TransformationRule: Record "Transformation Rule";
         EDocument: Record "E-Document";
         EDocDataStorage: Record "E-Doc. Data Storage";
-        EDocumentsSetup: Record "E-Documents Setup";
         EDocumentServiceStatus: Record "E-Document Service Status";
         EDocPurchLineFieldSetup: Record "ED Purchase Line Field Setup";
         PurchInvHeader: Record "Purch. Inv. Header";
@@ -695,7 +694,6 @@ codeunit 139883 "E-Doc Process Test"
         EDocumentService."Import Process" := "E-Document Import Process"::"Version 2.0";
         EDocumentService."Read into Draft Impl." := "E-Doc. Read into Draft"::PEPPOL;
         EDocumentService.Modify();
-        EDocumentsSetup.InsertNewExperienceSetup();
 
         TransformationRule.DeleteAll();
         TransformationRule.CreateDefaultTransformations();
diff --git a/src/Apps/W1/EDocument/Test/src/Processing/EDocumentStructuredTests.Codeunit.al b/src/Apps/W1/EDocument/Test/src/Processing/EDocumentStructuredTests.Codeunit.al
index 20437586c4..98e4cd174b 100644
--- a/src/Apps/W1/EDocument/Test/src/Processing/EDocumentStructuredTests.Codeunit.al
+++ b/src/Apps/W1/EDocument/Test/src/Processing/EDocumentStructuredTests.Codeunit.al
@@ -104,7 +104,6 @@ codeunit 139891 "E-Document Structured Tests"
         TransformationRule: Record "Transformation Rule";
         EDocument: Record "E-Document";
         EDocDataStorage: Record "E-Doc. Data Storage";
-        EDocumentsSetup: Record "E-Documents Setup";
         EDocumentServiceStatus: Record "E-Document Service Status";
         EDocumentPurchaseHeader: Record "E-Document Purchase Header";
         EDocumentPurchaseLine: Record "E-Document Purchase Line";
@@ -133,7 +132,6 @@ codeunit 139891 "E-Document Structured Tests"
         EDocumentService."Import Process" := "E-Document Import Process"::"Version 2.0";
         EDocumentService."Read into Draft Impl." := "E-Doc. Read into Draft"::"PDF Mock";
         EDocumentService.Modify();
-        EDocumentsSetup.InsertNewExperienceSetup();
 
         // Set a currency that can be used across all localizations
         Currency.Init();