diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py
index b00f769b5754..d2b2791af710 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py
@@ -158,10 +158,14 @@ def get_use_new_course_outline_page(self, obj):
 
     def get_use_new_unit_page(self, obj):
         """
-        Method to get the use_new_unit_page switch
+        Method to get the use_new_unit_page switch.
+
+        Always returns True. The legacy unit editor has been removed.
+        This method will be removed in a follow-up cleanup.
+
+        See https://github.com/openedx/edx-platform/issues/36275
         """
-        course_key = self.get_course_key()
-        return toggles.use_new_unit_page(course_key)
+        return True
 
     def get_use_new_course_team_page(self, obj):
         """
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/course_waffle_flags.py b/cms/djangoapps/contentstore/rest_api/v1/views/course_waffle_flags.py
index 69b2898912aa..ffab81ef8a66 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/course_waffle_flags.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/course_waffle_flags.py
@@ -57,7 +57,7 @@ def get(self, request, course_id=None):
             "use_new_files_uploads_page": true,
             "use_new_video_uploads_page": false,
             "use_new_course_outline_page": true,
-            "use_new_unit_page": false,
+            "use_new_unit_page": true,
             "use_new_course_team_page": true,
             "use_new_certificates_page": true,
             "use_new_textbooks_page": true,
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index d09a40ba71ef..8894596511fe 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -1,10 +1,5 @@
 # pylint: disable=missing-module-docstring
 
-# TODO: Rewrite several of these assertions so that they check the output of the REST or Python
-# APIs rather than parsing HTML from the deprecated legacy frontend pages. In particular, any
-# test case using override_waffle_flag(toggles.LEGACY_STUDIO_*, True) will need to be fixed.
-# Part of https://github.com/openedx/edx-platform/issues/36275.
-
 import copy
 import re
 import shutil
@@ -21,7 +16,7 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_flag, override_waffle_switch
+from edx_toggles.toggles.testutils import override_waffle_switch
 from edxval.api import create_video, get_videos_for_course
 from fs.osfs import OSFS
 from lxml import etree
@@ -30,7 +25,6 @@
 from opaque_keys.edx.locations import CourseLocator
 from path import Path as path
 
-from cms.djangoapps.contentstore import toggles
 from cms.djangoapps.contentstore.config import waffle
 from cms.djangoapps.contentstore.tests.utils import AjaxEnabledTestClient, CourseTestCase, get_url, parse_json
 from cms.djangoapps.contentstore.utils import delete_course, reverse_course_url, reverse_url
@@ -568,44 +562,6 @@ def setUp(self):
         )
         self.course = self.store.publish(self.course.location, self.user.id)
 
-    def check_components_on_page(self, component_types, expected_types):
-        """
-        Ensure that the right types end up on the page.
-
-        component_types is the list of advanced components.
-
-        expected_types is the list of elements that should appear on the page.
-
-        expected_types and component_types should be similar, but not
-        exactly the same -- for example, 'video' in
-        component_types should cause 'Video' to be present.
-        """
-        self.course.advanced_modules = component_types
-        self.store.update_item(self.course, self.user.id)
-
-        # just pick one vertical
-        resp = self.client.get_html(get_url('container_handler', self.vert_loc))
-        for expected in expected_types:
-            self.assertContains(resp, expected)
-
-    @override_waffle_flag(toggles.LEGACY_STUDIO_UNIT_EDITOR, True)
-    @ddt.data("<script>alert(1)</script>", "alert('hi')", "</script><script>alert(1)</script>")
-    def test_container_handler_xss_prevent(self, malicious_code):
-        """
-        Test that XSS attack is prevented
-        """
-        resp = self.client.get_html(get_url('container_handler', self.vert_loc) + '?action=' + malicious_code)
-        # Test that malicious code does not appear in html
-        self.assertNotContains(resp, malicious_code)
-
-    @override_waffle_flag(toggles.LEGACY_STUDIO_UNIT_EDITOR, True)
-    def test_advanced_components_in_edit_unit(self):
-        # This could be made better, but for now let's just assert that we see the advanced modules mentioned in the
-        # page response HTML
-        self.check_components_on_page(
-            ADVANCED_COMPONENT_TYPES,
-            ['Word cloud', 'Annotation', 'split_test'],
-        )
 
     @ddt.data('/Fake/asset/displayname', '\\Fake\\asset\\displayname')
     def test_export_on_invalid_displayname(self, invalid_displayname):
@@ -700,14 +656,6 @@ def test_assets_overwrite(self):
         # Remove tempdir
         shutil.rmtree(root_dir)
 
-    @override_waffle_flag(toggles.LEGACY_STUDIO_UNIT_EDITOR, True)
-    def test_advanced_components_require_two_clicks(self):
-        self.check_components_on_page(['word_cloud'], ['Word cloud'])
-
-    @override_waffle_flag(toggles.LEGACY_STUDIO_UNIT_EDITOR, True)
-    def test_edit_unit(self):
-        """Verifies rendering the editor in all the verticals in the given test course"""
-        self._check_verticals([self.vert_loc])
 
     def _get_draft_counts(self, item):  # pylint: disable=missing-function-docstring
         cnt = 1 if not self.store.has_published_version(item) else 0
@@ -1520,11 +1468,10 @@ def test_get_json(handler):
         )
         self.assertEqual(resp.status_code, 200)  # noqa: PT009
 
-        # go look at the Edit page
+        # go look at the Edit page — now redirects to MFE unit editor
         unit_key = course_key.make_usage_key('vertical', 'test_vertical')
-        with override_waffle_flag(toggles.LEGACY_STUDIO_UNIT_EDITOR, True):
-            resp = self.client.get_html(get_url('container_handler', unit_key))
-        self.assertEqual(resp.status_code, 200)  # noqa: PT009
+        resp = self.client.get_html(get_url('container_handler', unit_key))
+        self.assertEqual(resp.status_code, 302)  # noqa: PT009
 
         def delete_item(category, name):
             """ Helper method for testing the deletion of an xblock item. """
diff --git a/cms/djangoapps/contentstore/toggles.py b/cms/djangoapps/contentstore/toggles.py
index 94960ba66ec0..f7f67adc9057 100644
--- a/cms/djangoapps/contentstore/toggles.py
+++ b/cms/djangoapps/contentstore/toggles.py
@@ -194,23 +194,14 @@ def use_new_video_uploads_page(course_key):
 LEGACY_STUDIO_COURSE_OUTLINE = CourseWaffleFlag('legacy_studio.course_outline', __name__)
 
 
-# .. toggle_name: legacy_studio.unit_editor
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Temporarily fall back to the old Studio unit editing page.
-# .. toggle_use_cases: temporary
-# .. toggle_creation_date: 2025-03-14
-# .. toggle_target_removal_date: 2025-09-14
-# .. toggle_tickets: https://github.com/openedx/edx-platform/issues/36275
-# .. toggle_warning: In Ulmo, this toggle will be removed. Only the new (React-based) experience will be available.
-LEGACY_STUDIO_UNIT_EDITOR = CourseWaffleFlag('legacy_studio.unit_editor', __name__)
-
-
 def use_new_unit_page(course_key):
     """
-    Returns a boolean if new studio course outline mfe is enabled
+    Returns a boolean if new studio unit page is enabled.
+
+    Always returns True. The legacy unit editor has been removed.
+    This function will be removed in a follow-up cleanup once all callers are updated.
     """
-    return not LEGACY_STUDIO_UNIT_EDITOR.is_enabled(course_key)
+    return True
 
 
 # .. toggle_name: contentstore.mock_video_uploads
diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index 2f43a00610e8..cdd0bdf8c671 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -42,7 +42,6 @@
     libraries_v1_enabled,
     libraries_v2_enabled,
     split_library_view_on_dashboard,
-    use_new_unit_page,
 )
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
 from cms.djangoapps.models.settings.course_metadata import CourseMetadata
@@ -425,13 +424,10 @@ def get_unit_url(course_locator, unit_locator) -> str:
     """
     Gets course authoring microfrontend URL for unit page view.
     """
-    unit_url = None
-    if use_new_unit_page(course_locator):
-        mfe_base_url = get_course_authoring_url(course_locator)
-        course_mfe_url = f'{mfe_base_url}/course/{course_locator}/container/{unit_locator}'
-        if mfe_base_url:
-            unit_url = course_mfe_url
-    return unit_url
+    mfe_base_url = get_course_authoring_url(course_locator)
+    if mfe_base_url:
+        return f'{mfe_base_url}/course/{course_locator}/container/{unit_locator}'
+    return None
 
 
 def get_certificates_url(course_locator) -> str:
diff --git a/cms/djangoapps/contentstore/views/block.py b/cms/djangoapps/contentstore/views/block.py
index b2c0e39df77c..09f8c34a89aa 100644
--- a/cms/djangoapps/contentstore/views/block.py
+++ b/cms/djangoapps/contentstore/views/block.py
@@ -41,7 +41,6 @@
 )
 
 from ..helpers import is_unit
-from ..utils import get_container_handler_context
 from .component import _get_item_in_course
 from .preview import get_preview_fragment
 
@@ -289,38 +288,6 @@ def xblock_view_handler(request, usage_key_string, view_name):
         return HttpResponse(status=406)
 
 
-@xframe_options_exempt
-@require_http_methods(["GET"])
-@login_required
-def xblock_edit_view(request, usage_key_string):
-    """
-    Return rendered xblock edit view.
-
-    Allows editing of an XBlock specified by the usage key.
-    """
-    usage_key = usage_key_with_run(usage_key_string)
-    if not has_studio_read_access(request.user, usage_key.course_key):
-        raise PermissionDenied()
-
-    store = modulestore()
-
-    with store.bulk_operations(usage_key.course_key):
-        course, xblock, _, __ = _get_item_in_course(request, usage_key)
-        container_handler_context = get_container_handler_context(request, usage_key, course, xblock)
-
-        fragment = get_preview_fragment(request, xblock, {})
-
-        hashed_resources = {
-            hash_resource(resource): resource._asdict() for resource in fragment.resources
-        }
-
-        container_handler_context.update({
-            "action_name": "edit",
-            "resources": list(hashed_resources.items()),
-        })
-
-        return render_to_response('container_editor.html', container_handler_context)
-
 
 @require_http_methods("GET")
 @login_required
diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 05a9fc12d291..0b8176fbb5bd 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -22,7 +22,7 @@
 from xblock.runtime import Mixologist
 
 from cms.djangoapps.contentstore.helpers import get_parent_if_split_test, is_library_content, is_unit
-from cms.djangoapps.contentstore.toggles import libraries_v2_enabled, use_new_unit_page
+from cms.djangoapps.contentstore.toggles import libraries_v1_enabled, libraries_v2_enabled
 from cms.djangoapps.contentstore.xblock_storage_handlers.view_handlers import load_services_for_studio
 from common.djangoapps.edxmako.shortcuts import render_to_response
 from common.djangoapps.student.auth import has_course_author_access
@@ -130,44 +130,36 @@ def _load_mixed_class(category):
 
 @require_GET
 @login_required
-def container_handler(request, usage_key_string):  # pylint: disable=too-many-statements
+def container_handler(request, usage_key_string):
     """
-    The restful handler for container xblock requests.
+    Redirects to the MFE unit editor.
 
-    GET
-        html: returns the HTML page for editing a container
-        json: not currently supported
+    The legacy Django-template-based unit editor has been removed.
+    This view exists for backward compatibility with any existing links to /container/<usage_key>.
     """
+    from ..utils import get_unit_url
 
-    from ..utils import get_container_handler_context, get_unit_url
+    if 'text/html' not in request.META.get('HTTP_ACCEPT', 'text/html'):
+        return HttpResponseBadRequest("Only supports HTML requests")
 
-    if 'text/html' in request.META.get('HTTP_ACCEPT', 'text/html'):
+    try:
+        usage_key = UsageKey.from_string(usage_key_string)
+    except InvalidKeyError:
+        raise Http404  # pylint: disable=raise-missing-from  # noqa: B904
 
+    with modulestore().bulk_operations(usage_key.course_key):
         try:
-            usage_key = UsageKey.from_string(usage_key_string)
-        except InvalidKeyError:  # Raise Http404 on invalid 'usage_key_string'
-            raise Http404  # pylint: disable=raise-missing-from  # noqa: B904
-        with modulestore().bulk_operations(usage_key.course_key):
-            try:
-                course, xblock, lms_link, preview_lms_link = _get_item_in_course(request, usage_key)
-            except ItemNotFoundError:
-                return HttpResponseBadRequest()
-
-            if use_new_unit_page(course.id):
-                if is_unit(xblock) or is_library_content(xblock):
-                    return redirect(get_unit_url(course.id, xblock.location))
-
-                if split_xblock := get_parent_if_split_test(xblock):
-                    return redirect(get_unit_url(course.id, split_xblock.location))
-
-            container_handler_context = get_container_handler_context(request, usage_key, course, xblock)
-            container_handler_context.update({
-                'draft_preview_link': preview_lms_link,
-                'published_preview_link': lms_link,
-            })
-            return render_to_response('container.html', container_handler_context)
-    else:
-        return HttpResponseBadRequest("Only supports HTML requests")
+            course, xblock, lms_link, preview_lms_link = _get_item_in_course(request, usage_key)
+        except ItemNotFoundError:
+            return HttpResponseBadRequest()
+
+        if is_unit(xblock) or is_library_content(xblock):
+            return redirect(get_unit_url(course.id, xblock.location))
+
+        if split_xblock := get_parent_if_split_test(xblock):
+            return redirect(get_unit_url(course.id, split_xblock.location))
+
+    raise Http404
 
 
 @require_GET
@@ -176,7 +168,8 @@ def container_handler(request, usage_key_string):  # pylint: disable=too-many-st
 def container_embed_handler(request, usage_key_string):  # pylint: disable=too-many-statements
     """
     Returns an HttpResponse with HTML content for the container XBlock.
-    The returned HTML is a chromeless rendering of the XBlock.
+    The returned HTML is a chromeless rendering of the XBlock, used by the
+    Authoring MFE to display xblock content in iframes.
 
     GET
         html: returns the HTML page for editing a container
diff --git a/cms/djangoapps/contentstore/views/tests/test_block.py b/cms/djangoapps/contentstore/views/tests/test_block.py
index 9e53a3aa0195..44b2cbdbca8d 100644
--- a/cms/djangoapps/contentstore/views/tests/test_block.py
+++ b/cms/djangoapps/contentstore/views/tests/test_block.py
@@ -4700,76 +4700,3 @@ def test_update_clobbers(self):
         self.check_updated(source_block, destination_block.location)
 
 
-class TestXblockEditView(CourseTestCase):
-    """
-    Test xblock_edit_view.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.chapter = self._create_block(self.course, "chapter", "Week 1")
-        self.sequential = self._create_block(self.chapter, "sequential", "Lesson 1")
-        self.vertical = self._create_block(self.sequential, "vertical", "Unit")
-        self.html = self._create_block(self.vertical, "html", "HTML")
-        self.child_container = self._create_block(
-            self.vertical, "split_test", "Split Test"
-        )
-        self.child_vertical = self._create_block(
-            self.child_container, "vertical", "Child Vertical"
-        )
-        self.video = self._create_block(self.child_vertical, "video", "My Video")
-        self.store = modulestore()
-
-        self.store.publish(self.vertical.location, self.user.id)
-
-    def _create_block(self, parent, category, display_name, **kwargs):
-        """
-        creates a block in the module store, without publishing it.
-        """
-        return BlockFactory.create(
-            parent=parent,
-            category=category,
-            display_name=display_name,
-            publish_item=False,
-            user_id=self.user.id,
-            **kwargs,
-        )
-
-    def test_xblock_edit_view(self):
-        url = reverse_usage_url("xblock_edit_handler", self.video.location)
-        resp = self.client.get_html(url)
-        self.assertEqual(resp.status_code, 200)  # noqa: PT009
-
-        html_content = resp.content.decode(resp.charset)
-        self.assertIn("var decodedActionName = 'edit';", html_content)  # noqa: PT009
-
-    def test_xblock_edit_view_contains_resources(self):
-        url = reverse_usage_url("xblock_edit_handler", self.video.location)
-        resp = self.client.get(url)
-        self.assertEqual(resp.status_code, 200)  # noqa: PT009
-
-        html_content = resp.content.decode(resp.charset)
-        soup = BeautifulSoup(html_content, "html.parser")
-
-        resource_links = [link["href"] for link in soup.find_all("link", {"rel": "stylesheet"})]
-        script_sources = [script["src"] for script in soup.find_all("script") if script.get("src")]
-
-        self.assertGreater(len(resource_links), 0, f"No CSS resources found in HTML. Found: {resource_links}")  # noqa: PT009  # pylint: disable=line-too-long
-        self.assertGreater(len(script_sources), 0, f"No JS resources found in HTML. Found: {script_sources}")  # noqa: PT009  # pylint: disable=line-too-long
-
-    def test_xblock_edit_view_contains_page_notification(self):
-        """
-        The page-notification element is required for XBlock runtime error
-        notifications (e.g. ORA validation errors) to be visible to the user.
-        """
-        url = reverse_usage_url("xblock_edit_handler", self.video.location)
-        resp = self.client.get(url)
-        self.assertEqual(resp.status_code, 200)  # noqa: PT009
-
-        html_content = resp.content.decode(resp.charset)
-        soup = BeautifulSoup(html_content, "html.parser")
-        self.assertIsNotNone(  # noqa: PT009
-            soup.find(id="page-notification"),
-            "container_editor.html must include a #page-notification element "
-            "so that XBlock runtime error notifications are rendered.",
-        )
diff --git a/cms/djangoapps/contentstore/views/tests/test_container_page.py b/cms/djangoapps/contentstore/views/tests/test_container_page.py
index fbb14634820c..f0df927d49f8 100644
--- a/cms/djangoapps/contentstore/views/tests/test_container_page.py
+++ b/cms/djangoapps/contentstore/views/tests/test_container_page.py
@@ -5,17 +5,14 @@
 
 import datetime
 import re
-from unittest.mock import Mock, patch
 from urllib.parse import quote
 
 from django.http import Http404
 from django.test.client import RequestFactory
 from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_flag
 from pytz import UTC
 
 import cms.djangoapps.contentstore.views.component as views
-from cms.djangoapps.contentstore import toggles
 from cms.djangoapps.contentstore.tests.test_libraries import LibraryTestCase
 from xmodule.modulestore import ModuleStoreEnum  # pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore  # pylint: disable=wrong-import-order
@@ -88,46 +85,6 @@ def test_container_html(self):
             ),
         )
 
-    @override_waffle_flag(toggles.LEGACY_STUDIO_UNIT_EDITOR, True)
-    def test_container_on_container_html(self):
-        """
-        Create the scenario of an xblock with children (non-vertical) on the container page.
-        This should create a container page that is a child of another container page.
-        """
-        draft_container = self._create_block(self.child_container, "wrapper", "Wrapper")
-        self._create_block(draft_container, "html", "Child HTML")
-
-        def test_container_html(xblock):
-            assets_url = reverse(
-                'assets_handler', kwargs={'course_key_string': str(draft_container.location.course_key)}
-            )
-            self._test_html_content(
-                xblock,
-                expected_section_tag=(
-                    '<section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" '  # noqa: UP032
-                    'data-locator="{0}" data-course-key="{0.course_key}" data-course-assets="{1}">'.format(
-                        draft_container.location, assets_url
-                    )
-                ),
-                expected_breadcrumbs=(
-                    '<a href="/course/{course}{subsection_parameters}">Lesson 1</a>.*'
-                    '<a href="/container/{unit_parameters}">Unit</a>.*'
-                ).format(
-                    course=re.escape(str(self.course.id)),
-                    unit_parameters=re.escape(str(self.vertical.location)),
-                    subsection_parameters=re.escape('?show={}'.format(quote(
-                        str(self.sequential.location).encode()
-                    ))),
-                ),
-            )
-
-        # Test the draft version of the container
-        test_container_html(draft_container)
-
-        # Now publish the unit and validate again
-        self.store.publish(self.vertical.location, self.user.id)
-        draft_container = self.store.get_item(draft_container.location)
-        test_container_html(draft_container)
 
     def _test_html_content(self, xblock, expected_section_tag, expected_breadcrumbs):
         """
@@ -223,17 +180,13 @@ def test_draft_child_container_preview_html(self):
         empty_child_container = self._create_block(self.vertical, 'split_test', 'Split Test 1')
         self.validate_preview_html(empty_child_container, self.reorderable_child_view, can_add=False)
 
-    @patch(
-        'cms.djangoapps.contentstore.views.component.render_to_response',
-        Mock(return_value=Mock(status_code=200, content=''))
-    )
-    @override_waffle_flag(toggles.LEGACY_STUDIO_UNIT_EDITOR, True)
     def test_container_page_with_valid_and_invalid_usage_key_string(self):
         """
-        Check that invalid 'usage_key_string' raises Http404.
+        Check that invalid 'usage_key_string' raises Http404 and valid key redirects to MFE.
         """
         request = RequestFactory().get('foo')
         request.user = self.user
+        request.META['HTTP_ACCEPT'] = 'text/html'
         request.LANGUAGE_CODE = 'en'
 
         # Check for invalid 'usage_key_strings'
@@ -243,68 +196,11 @@ def test_container_page_with_valid_and_invalid_usage_key_string(self):
             usage_key_string='i4x://InvalidOrg/InvalidCourse/vertical/static/InvalidContent',
         )
 
-        # Check 200 response if 'usage_key_string' is correct
+        # Check redirect response if 'usage_key_string' is correct (now redirects to MFE)
         response = views.container_handler(
             request=request,
             usage_key_string=str(self.vertical.location)
         )
-        self.assertEqual(response.status_code, 200)  # noqa: PT009
-
-
-class ContainerEmbedPageTestCase(ContainerPageTestCase):  # pylint: disable=test-inherits-tests
-    """
-    Unit tests for the container embed page.
-    """
-
-    def test_container_html(self):
-        assets_url = reverse(
-            'assets_handler', kwargs={'course_key_string': str(self.child_container.location.course_key)}
-        )
-        self._test_html_content(
-            self.child_container,
-            expected_section_tag=(
-                '<section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" '  # noqa: UP032
-                'data-locator="{0}" data-course-key="{0.course_key}" data-course-assets="{1}">'.format(
-                    self.child_container.location, assets_url
-                )
-            ),
-        )
-
-    @override_waffle_flag(toggles.LEGACY_STUDIO_UNIT_EDITOR, True)
-    def test_container_on_container_html(self):
-        """
-        Create the scenario of an xblock with children (non-vertical) on the container page.
-        This should create a container page that is a child of another container page.
-        """
-        draft_container = self._create_block(self.child_container, "wrapper", "Wrapper")
-        self._create_block(draft_container, "html", "Child HTML")
+        self.assertEqual(response.status_code, 302)  # noqa: PT009
 
-        def test_container_html(xblock):
-            assets_url = reverse(
-                'assets_handler', kwargs={'course_key_string': str(draft_container.location.course_key)}
-            )
-            self._test_html_content(
-                xblock,
-                expected_section_tag=(
-                    '<section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" '  # noqa: UP032
-                    'data-locator="{0}" data-course-key="{0.course_key}" data-course-assets="{1}">'.format(
-                        draft_container.location, assets_url
-                    )
-                ),
-            )
 
-        # Test the draft version of the container
-        test_container_html(draft_container)
-
-        # Now publish the unit and validate again
-        self.store.publish(self.vertical.location, self.user.id)
-        draft_container = self.store.get_item(draft_container.location)
-        test_container_html(draft_container)
-
-    def _test_html_content(self, xblock, expected_section_tag):  # pylint: disable=arguments-differ
-        """
-        Get the HTML for a container page and verify the section tag is correct
-        and the breadcrumbs trail is correct.
-        """
-        html = self.get_page_html(xblock)
-        self.assertIn(expected_section_tag, html)  # noqa: PT009
diff --git a/cms/static/js/spec/views/unit_outline_spec.js b/cms/static/js/spec/views/unit_outline_spec.js
deleted file mode 100644
index 99eb7d5da399..000000000000
--- a/cms/static/js/spec/views/unit_outline_spec.js
+++ /dev/null
@@ -1,150 +0,0 @@
-define(['jquery', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/template_helpers',
-    'common/js/spec_helpers/view_helpers', 'common/js/components/utils/view_utils', 'js/models/course',
-    'js/views/unit_outline', 'js/models/xblock_info'],
-function($, sinon, AjaxHelpers, TemplateHelpers, ViewHelpers, ViewUtils,
-    Course, UnitOutlineView, XBlockInfo) {
-    'use strict';
-
-    describe('UnitOutlineView', function() {
-        // Preload before beforeEach installs fake XHR, so readFixtures uses real XHR
-        // and the result is cached. See group_configuration_spec.js for full explanation.
-        readFixtures('unit-outline.underscore');
-
-        var createUnitOutlineView, createMockXBlockInfo,
-            requests, xhrFactory, model, unitOutlineView;
-
-        createUnitOutlineView = function(test, unitJSON, createOnly) {
-            model = new XBlockInfo(unitJSON, {parse: true});
-            unitOutlineView = new UnitOutlineView({
-                model: model,
-                el: $('.wrapper-unit-overview')
-            });
-            if (!createOnly) {
-                unitOutlineView.render();
-            }
-            return unitOutlineView;
-        };
-
-        createMockXBlockInfo = function(displayName) {
-            return {
-                id: 'mock-unit',
-                category: 'vertical',
-                display_name: displayName,
-                studio_url: '/container/mock-unit',
-                visibility_state: 'unscheduled',
-                ancestor_info: {
-                    ancestors: [{
-                        id: 'mock-subsection',
-                        category: 'sequential',
-                        display_name: 'Mock Subsection',
-                        studio_url: '/course/mock-course?show=mock-subsection',
-                        visibility_state: 'unscheduled',
-                        child_info: {
-                            category: 'vertical',
-                            display_name: 'Unit',
-                            children: [{
-                                id: 'mock-unit',
-                                category: 'vertical',
-                                display_name: displayName,
-                                studio_url: '/container/mock-unit',
-                                visibility_state: 'unscheduled'
-                            }, {
-                                id: 'mock-unit-2',
-                                category: 'vertical',
-                                display_name: 'Mock Unit 2',
-                                studio_url: '/container/mock-unit-2',
-                                visibility_state: 'unscheduled'
-                            }]
-                        }
-                    }, {
-                        id: 'mock-section',
-                        category: 'chapter',
-                        display_name: 'Section',
-                        studio_url: '/course/slashes:mock-course?show=mock-section',
-                        visibility_state: 'unscheduled'
-                    }, {
-                        id: 'mock-course',
-                        category: 'course',
-                        display_name: 'Mock Course',
-                        studio_url: '/course/mock-course',
-                        visibility_state: 'unscheduled'
-                    }]
-                },
-                metadata: {
-                    display_name: 'Mock Unit'
-                }
-            };
-        };
-
-        beforeEach(function() {
-            xhrFactory = sinon.useFakeXMLHttpRequest();
-            requests = [];
-            requests.currentIndex = 0;
-            requests.restore = function() { xhrFactory.restore(); };
-            xhrFactory.onCreate = function(req) { requests.push(req); };
-            window.course = new Course({
-                id: '5',
-                name: 'Course Name',
-                url_name: 'course_name',
-                org: 'course_org',
-                num: 'course_num',
-                revision: 'course_rev'
-            });
-            ViewHelpers.installMockAnalytics();
-            ViewHelpers.installViewTemplates();
-            TemplateHelpers.installTemplate('unit-outline');
-            appendSetFixtures('<div class="wrapper-unit-overview"></div>');
-        });
-
-        afterEach(function() {
-            requests.restore();
-            delete window.course;
-            ViewHelpers.removeMockAnalytics();
-        });
-
-        it('can render itself', function() {
-            createUnitOutlineView(this, createMockXBlockInfo('Mock Unit'));
-            expect(unitOutlineView.$('.list-sections')).toExist();
-            expect(unitOutlineView.$('.list-subsections')).toExist();
-            expect(unitOutlineView.$('.list-units')).toExist();
-        });
-
-        it('highlights the current unit', function() {
-            createUnitOutlineView(this, createMockXBlockInfo('Mock Unit'));
-            $('.outline-unit').each(function(i) {
-                if ($(this).data('locator') === model.get('id')) {
-                    expect($(this)).toHaveClass('is-current');
-                } else {
-                    expect($(this)).not.toHaveClass('is-current');
-                }
-            });
-        });
-
-        it('can add a unit', function() {
-            var redirectSpy;
-            createUnitOutlineView(this, createMockXBlockInfo('Mock Unit'));
-            redirectSpy = spyOn(ViewUtils, 'redirect');
-            unitOutlineView.$('.outline-subsection > .outline-content  > .add-unit .button-new').click();
-            AjaxHelpers.expectJsonRequest(requests, 'POST', '/xblock/', {
-                category: 'vertical',
-                display_name: 'Unit',
-                parent_locator: 'mock-subsection'
-            });
-            AjaxHelpers.respondWithJson(requests, {
-                locator: 'new-mock-unit',
-                courseKey: 'slashes:MockCourse'
-            });
-            expect(redirectSpy).toHaveBeenCalledWith('/container/new-mock-unit?action=new');
-        });
-
-        it('refreshes when the XBlockInfo model syncs', function() {
-            var updatedDisplayName = 'Mock Unit Updated';
-            createUnitOutlineView(this, createMockXBlockInfo('Mock Unit'));
-            unitOutlineView.refresh();
-            AjaxHelpers.expectJsonRequest(requests, 'GET', '/xblock/mock-unit');
-            AjaxHelpers.respondWithJson(requests,
-                createMockXBlockInfo(updatedDisplayName));
-            expect(unitOutlineView.$('.outline-unit .unit-title').first().text().trim()).toBe(updatedDisplayName);
-        });
-    });
-});
diff --git a/cms/templates/container.html b/cms/templates/container.html
deleted file mode 100644
index e1995de4ba58..000000000000
--- a/cms/templates/container.html
+++ /dev/null
@@ -1,276 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%def name="online_help_token()">
-<%
-if is_unit_page:
-    return "unit"
-else:
-    return "container"
-%>
-</%def>
-<%!
-from django.urls import reverse
-from django.utils.translation import gettext as _
-
-from cms.djangoapps.contentstore.helpers import xblock_studio_url, xblock_type_display_name
-from cms.djangoapps.contentstore.toggles import use_new_pdf_editor, use_video_gallery_flow
-from cms.djangoapps.contentstore.utils import get_editor_page_base_url
-from openedx.core.djangolib.js_utils import (
-    dump_js_escaped_json, js_escaped_string
-)
-from openedx.core.djangolib.markup import HTML, Text
-%>
-
-<%block name="title">${xblock.display_name_with_default} ${xblock_type_display_name(xblock)}</%block>
-<%block name="bodyclass">is-signedin course container view-container</%block>
-
-<%namespace name='static' file='static_content.html'/>
-
-<%block name="header_extras">
-% for template_name in templates:
-<script type="text/template" id="${template_name}-tpl">
-    <%static:include path="js/${template_name}.underscore" />
-</script>
-% endfor
-<script type="text/template" id="image-modal-tpl">
-    <%static:include path="common/templates/image-modal.underscore" />
-</script>
-<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
-</%block>
-
-<%block name="page_bundle">
-    <%static:webpack entry="js/factories/container">
-        ContainerFactory(
-            ${component_templates | n, dump_js_escaped_json},
-            ${xblock_info | n, dump_js_escaped_json},
-            "${action | n, js_escaped_string}",
-            {
-                isUnitPage: ${is_unit_page | n, dump_js_escaped_json},
-                canEdit: true,
-                outlineURL: "${outline_url | n, js_escaped_string}",
-                libraryContentPickerUrl: "${library_content_picker_url | n, js_escaped_string}",
-                clipboardData: ${user_clipboard | n, dump_js_escaped_json},
-            }
-        );
-
-        require(["js/models/xblock_info", "js/views/xblock", "js/views/utils/xblock_utils", "common/js/components/utils/view_utils", "gettext"], function (XBlockInfo, XBlockView, XBlockUtils, ViewUtils, gettext) {
-            var model = new XBlockInfo({
-                id: '${subsection.location|n, decode.utf8}'
-            });
-            var xblockView = new XBlockView({
-                model: model,
-                el: $('#sequence-nav'),
-                view: 'author_view?position=${position|n, decode.utf8}&next_url=${next_url|n, decode.utf8}&prev_url=${prev_url|n, decode.utf8}',
-                clipboardData: ${user_clipboard | n, dump_js_escaped_json},
-            });
-
-            xblockView.xblockReady = function() {
-
-                var toggleCaretButton = function(clipboardData) {
-                    if (clipboardData && clipboardData.content && clipboardData.source_usage_key.includes("vertical")) {
-                        $('.dropdown-toggle-button').show();
-                    } else {
-                        $('.dropdown-toggle-button').hide();
-                        $('.dropdown-options').hide();
-                    }
-                };
-                this.clipboardBroadcastChannel = new BroadcastChannel("studio_clipboard_channel");
-                this.clipboardBroadcastChannel.onmessage = (event) => {
-                    toggleCaretButton(event.data);
-                };
-                toggleCaretButton(this.options.clipboardData);
-
-                $('#new-unit-button').on('click', function(event) {
-                    event.preventDefault();
-                    XBlockUtils.addXBlock($(this)).done(function(locator) {
-                        ViewUtils.redirect('/container/' + locator + '?action=new');
-                    });
-                });
-
-                $('.custom-dropdown .dropdown-toggle-button').on('click', function(event) {
-                    event.stopPropagation(); // Prevent the event from closing immediately when we open it
-                    $(this).next('.dropdown-options').slideToggle('fast'); // This toggles the dropdown visibility
-                    var isExpanded = $(this).attr('aria-expanded') === 'true';
-                    $(this).attr('aria-expanded', !isExpanded);
-                });
-
-                $('.seq_paste_unit').on('click', function(event) {
-                    event.preventDefault();
-                    $('.dropdown-options').hide();
-                    XBlockUtils.pasteXBlock($(this)).done(function(data) {
-                        ViewUtils.redirect('/container/' + data.locator + '?action=new');
-                    });
-                });
-            };
-
-            xblockView.render();
-        });
-    </%static:webpack>
-</%block>
-
-<%block name="content">
-
-<%
-use_new_editor_pdf = use_new_pdf_editor()
-use_new_video_gallery_flow = use_video_gallery_flow()
-%>
-
-<script type="text/javascript">
-    window.STUDIO_FRONTEND_IN_CONTEXT_IMAGE_SELECTION = true;
-</script>
-
-
-<div class="wrapper-mast wrapper">
-    <header class="mast has-actions has-navigation has-subtitle">
-        <div class="jump-nav">
-            <nav class="nav-dd title ui-left">
-                <ol>
-                % for block in ancestor_xblocks:
-                    <li class="nav-item">
-                        <span class="title label">${block['title']}
-                            <span class="icon fa fa-caret-down ui-toggle-dd" aria-hidden="true"></span>
-                        </span>
-                        % if not block['is_last']:
-                        <span class="spacer"> &rsaquo;</span>
-                        % endif
-                        <div class="wrapper wrapper-nav-sub">
-                            <div class="nav-sub">
-                                <ul>
-                                % for child in block['children']:
-                                    <%
-                                        # Not all xblock has their own studio page
-                                        # Check if siblings has any url to their own studio
-                                        # page, otherwise avoid including them in dropdown.
-                                        url = xblock_studio_url(child)
-                                    %>
-                                    % if url:
-                                        <li class="nav-item">
-                                            <a href="${url}">${child.display_name_with_default}</a>
-                                        </li>
-                                    % endif
-                                % endfor
-                                </ul>
-                            </div>
-                        </div>
-                    </li>
-                % endfor
-                </ol>
-            </nav>
-
-              <div class="wrapper-xblock-field incontext-editor is-editable"
-                 data-field="display_name" data-field-display-name="${_("Display Name")}">
-                <h1 class="page-header-title xblock-field-value incontext-editor-value"><span class="title-value">${xblock.display_name_with_default}</span></h1>
-            </div>
-            <div class="container-access">
-            </div>
-        </div>
-
-        <nav class="nav-actions" aria-label="${_('Page Actions')}"
-        use-new-editor-pdf = ${use_new_editor_pdf}
-        use-video-gallery-flow = ${use_new_video_gallery_flow}
-        authoring_MFE_base_url = ${get_editor_page_base_url(xblock_locator.course_key)}
-        data-block-type = ${xblock.scope_ids.block_type}
-        data-usage-id = ${xblock.scope_ids.usage_id}
-        >
-            <h3 class="sr">${_("Page Actions")}</h3>
-            <ul>
-                ## Hide the sequence navigation when we've browsed into a child of the unit, e.g. showing the child blocks of a problem-builder xblock
-                % if is_unit_page:
-                    <li class="action-item action-view nav-item">
-                        <a href="${published_preview_link}" class="button button-view action-button is-disabled" aria-disabled="true" rel="external" title="${_('Open the courseware in the LMS')}">
-                            <span class="action-button-text">${_("View Live Version")}</span>
-                        </a>
-                    </li>
-                    <li class="action-item action-preview nav-item">
-                        <a href="${draft_preview_link}" class="button button-preview action-button" rel="external" title="${_('Preview the courseware in the LMS')}">
-                            <span class="action-button-text">${_("Preview")}</span>
-                        </a>
-                    </li>
-                % else:
-                    <li class="action-item action-edit nav-item">
-                        <a href="#" class="button button-edit action-button edit-button">
-                            <span class="icon fa fa-pencil" aria-hidden="true"></span>
-                            <span class="action-button-text">${_("Edit")}</span>
-                        </a>
-                    </li>
-                    % if is_collapsible:
-                        <li class="action-item action-toggle-preview nav-item">
-                            <a href="#" class="button button-toggle-preview action-button">
-                                <span class="icon fa fa-arrow-up" aria-hidden="true"></span>
-                                <span class="action-button-text preview-text">${_("Collapse All")}</span>
-                            </a>
-                        </li>
-                    % endif
-                % endif
-            </ul>
-        </nav>
-    % if is_unit_page:
-    <div id="sequence-nav"></div>
-    % endif
-    </header>
-</div>
-
-<div class="wrapper-content wrapper">
-    <div class="inner-wrapper">
-        <section class="content-area">
-            <article class="content-primary ${'content-primary-fullwidth' if is_fullwidth_content else ''}">
-                <div class="container-message wrapper-message"></div>
-                <%
-                    assets_url = reverse('assets_handler', kwargs={'course_key_string': str(xblock_locator.course_key)})
-                %>
-                <section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" data-locator="${xblock_locator}" data-course-key="${xblock_locator.course_key}" data-course-assets="${assets_url}">
-                </section>
-                <div class="ui-loading">
-                    <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
-                </div>
-            </article>
-            <aside class="content-supplementary" role="complementary">
-                % if xblock.category == 'split_test':
-                    <div class="bit">
-                        <h3 class="title-3">${_("Adding components")}</h3>
-                        <p>${Text(_("Select a component type under {strong_start}Add New Component{strong_end}. Then select a template.")).format(
-                                    strong_start=HTML('<strong>'),
-                                    strong_end=HTML("</strong>"),
-                            )}</p>
-                        <p>${_("The new component is added at the bottom of the page or group. You can then edit and move the component.")}</p>
-                        <h3 class="title-3">${_("Editing components")}</h3>
-                        <p>${Text(_("Click the {strong_start}Edit{strong_end} icon in a component to edit its content.")).format(
-                                    strong_start=HTML('<strong>'),
-                                    strong_end=HTML("</strong>"),
-                            )}</p>
-                        <h3 class="title-3">${_("Reorganizing components")}</h3>
-                        <p>${_("Drag components to new locations within this component.")}</p>
-                        <p>${_("For content experiments, you can drag components to other groups.")}</p>
-                        <h3 class="title-3">${_("Working with content experiments")}</h3>
-                        <p>${_("Confirm that you have properly configured content in each of your experiment groups.")}</p>
-                    </div>
-                    <div class="bit external-help">
-                        <a href="${get_online_help_info(online_help_token())['doc_url']}" rel="noopener" target="_blank" class="button external-help-button">${_("Learn more about component containers")}</a>
-                    </div>
-                % elif is_unit_page:
-                    <div id="publish-unit"></div>
-                    <div id="publish-history" class="unit-publish-history"></div>
-                    <div class="unit-location is-hidden">
-                        <h4 class="bar-mod-title">${_("Unit Location")}</h4>
-                        <div class="wrapper-unit-id bar-mod-content">
-                            <h5 class="title">${_("Location ID")}</h5>
-                            <p class="unit-id">
-                                <span class="unit-id-value" id="unit-location-id-input">${unit.location.block_id}</span>
-                                <span class="tip"><span class="sr">Tip: </span>${Text(_('To create a link to this unit from an HTML component in this course, enter {unit_link} as the URL value.')).format(
-                                    unit_link="/jump_to_id/{}".format(unit.location.block_id)
-                                )}</span>
-                            </p>
-                        </div>
-                    </div>
-                    % if show_unit_tags:
-                        <div class="unit-tags is-hidden"></div>
-                    % endif
-                % endif
-            </aside>
-        </section>
-    </div>
-</div>
-
-<div id="manage-tags-drawer" class="drawer"></div>
-<div class="drawer-cover gray-cover"></div>
-</%block>
diff --git a/cms/templates/container_editor.html b/cms/templates/container_editor.html
deleted file mode 100644
index 3bea1e3d2118..000000000000
--- a/cms/templates/container_editor.html
+++ /dev/null
@@ -1,130 +0,0 @@
-## coding=utf-8
-## mako
-
-## Pages currently use v1 styling by default. Once the Pattern Library
-## rollout has been completed, this default can be switched to v2.
-<%! main_css = "style-main-v1" %>
-
-<%! course_unit_mfe_iframe_css = "course-unit-mfe-iframe-bundle" %>
-
-## Standard imports
-<%namespace name='static' file='static_content.html'/>
-<%!
-from django.utils.translation import gettext as _
-from cms.djangoapps.contentstore.config.waffle import CUSTOM_RELATIVE_DATES
-from lms.djangoapps.branding import api as branding_api
-from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
-from cms.djangoapps.contentstore.helpers import xblock_type_display_name
-from openedx.core.release import RELEASE_LINE
-%>
-<%def name="online_help_token()">
-<%
-    return "container"
-%>
-</%def>
-
-<%page expression_filter="h"/>
-<!doctype html>
-<html lang="${LANGUAGE_CODE}">
-<head dir="${static.dir_rtl()}">
-    <%
-        jsi18n_path = "js/i18n/{language}/djangojs.js".format(language=LANGUAGE_CODE)
-    %>
-
-    % if getattr(settings, 'CAPTURE_CONSOLE_LOG', False):
-        <script type="text/javascript">
-            var oldOnError = window.onerror;
-            window.localStorage.setItem('console_log_capture', JSON.stringify([]));
-
-            window.onerror = function (message, url, lineno, colno, error) {
-                if (oldOnError) {
-                    oldOnError.apply(this, arguments);
-                }
-
-                var messages = JSON.parse(window.localStorage.getItem('console_log_capture'));
-                messages.push([message, url, lineno, colno, (error || {}).stack]);
-                window.localStorage.setItem('console_log_capture', JSON.stringify(messages));
-            }
-        </script>
-    % endif
-
-    <script type="text/javascript" src="${static.url(jsi18n_path)}"></script>
-
-    % if settings.DEBUG:
-        <script type="text/javascript" src="${static.url('js/src/gettext_fallback.js')}"></script>
-    % endif
-
-    <%static:css group='style-vendor'/>
-    <%static:css group='style-vendor-tinymce-content'/>
-    <%static:css group='style-vendor-tinymce-skin'/>
-    <%static:css group='${self.attr.course_unit_mfe_iframe_css}'/>
-
-    % if uses_bootstrap:
-        <link rel="stylesheet" href="${static.url(self.attr.main_css)}" type="text/css" media="all" />
-    % else:
-        <%static:css group='${self.attr.main_css}'/>
-    % endif
-
-    <%include file="widgets/segment-io.html" />
-
-    <%block name="header_extras">
-        % for template_name in templates:
-            <script type="text/template" id="${template_name}-tpl">
-                <%static:include path="js/${template_name}.underscore" />
-            </script>
-        % endfor
-        <script type="text/template" id="image-modal-tpl">
-            <%static:include path="common/templates/image-modal.underscore" />
-        </script>
-
-        <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
-        % for _, resource in resources:
-            % if resource['kind'] == 'url' and resource['mimetype'] == 'text/css':
-                <link rel="stylesheet" href="${resource['data']}" type="text/css" />
-            % endif
-        % endfor
-    </%block>
-
-    <!-- Hotjar Tracking Code -->
-    <script>
-        (function(h, o, t, j, a, r){
-            h.hj = h.hj || function() { (h.hj.q = h.hj.q || []).push(arguments) };
-            h._hjSettings={ hjid: Number('${settings.HOTJAR_ID |n, js_escaped_string}'), hjsv: 6 };
-            a = o.getElementsByTagName('head')[0];
-            r = o.createElement('script');
-            r.async = 1;
-            r.src = t + h._hjSettings.hjid + j + h._hjSettings.hjsv;
-            a.appendChild(r);
-        })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
-    </script>
-</head>
-
-<body class="${static.dir_rtl()} <%block name='bodyclass'></%block> lang_${LANGUAGE_CODE} view-container">
-    <div id="page-notification"></div>
-    <%static:js group='base_vendor' />
-    <%static:webpack entry='commons' />
-
-    <script type="text/javascript">
-        window.baseUrl = '${settings.STATIC_URL | n, js_escaped_string}';
-        require.config({ baseUrl: window.baseUrl });
-    </script>
-    <script type="text/javascript" src="${static.url("cms/js/require-config.js")}"></script>
-
-    <%block name='page_bundle'>
-        <%static:webpack entry="js/factories/container">
-            require(['js/models/xblock_info', 'js/views/modals/edit_xblock'],
-            function (XBlockInfo, EditXBlockModal) {
-                var decodedActionName = '${action_name|n, decode.utf8}';
-                var encodedXBlockDetails = ${xblock_info | n, dump_js_escaped_json};
-
-                if (decodedActionName === 'edit') {
-                    var editXBlockModal = new EditXBlockModal();
-                    var xblockInfoInstance = new XBlockInfo(encodedXBlockDetails);
-
-                    editXBlockModal.edit([], xblockInfoInstance, {});
-                }
-            });
-        </%static:webpack>
-    </%block>
-</body>
-</html>
diff --git a/cms/urls.py b/cms/urls.py
index c0f96f489bb8..d0d917294d96 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -19,7 +19,6 @@
 import openedx.core.djangoapps.lang_pref.views
 from cms.djangoapps.contentstore import toggles
 from cms.djangoapps.contentstore import views as contentstore_views
-from cms.djangoapps.contentstore.views.block import xblock_edit_view
 from cms.djangoapps.contentstore.views.organization import OrganizationListView
 from openedx.core import toggles as core_toggles
 from openedx.core.apidocs import api_info
@@ -153,8 +152,6 @@
             name='xblock_outline_handler'),
     re_path(fr'^xblock/container/{settings.USAGE_KEY_PATTERN}$', contentstore_views.xblock_container_handler,
             name='xblock_container_handler'),
-    re_path(fr'^xblock/{settings.USAGE_KEY_PATTERN}/action/edit$', xblock_edit_view,
-            name='xblock_edit_handler'),
     re_path(fr'^xblock/{settings.USAGE_KEY_PATTERN}/(?P<view_name>[^/]+)$', contentstore_views.xblock_view_handler,
             name='xblock_view_handler'),
     re_path(fr'^xblock/{settings.USAGE_KEY_PATTERN}?$', contentstore_views.xblock_handler,