diff --git a/cms/djangoapps/contentstore/rest_api/v0/views/advanced_settings.py b/cms/djangoapps/contentstore/rest_api/v0/views/advanced_settings.py
index 7516bba37228..6e8bc782cf2f 100644
--- a/cms/djangoapps/contentstore/rest_api/v0/views/advanced_settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/views/advanced_settings.py
@@ -172,7 +172,7 @@ def patch(self, request: Request, course_id: str):
                     "lti_consumer"
                 ]
             },
-            "show_calculator": {
+            "course_survey_required": {
                 "value": true
             }
         }
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index e40d0c925630..b6dabf38750b 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -1230,80 +1230,6 @@ def test_update_from_json_filtered_off(self):
         )
         self.assertNotIn('giturl', test_model)
 
-    @patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
-    def test_edxnotes_present(self):
-        """
-        If feature flag ENABLE_EDXNOTES is on, show the setting as a non-deprecated Advanced Setting.
-        """
-        test_model = CourseMetadata.fetch(self.fullcourse)
-        self.assertIn('edxnotes', test_model)
-
-    @patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': False})
-    def test_edxnotes_not_present(self):
-        """
-        If feature flag ENABLE_EDXNOTES is off, don't show the setting at all on the Advanced Settings page.
-        """
-        test_model = CourseMetadata.fetch(self.fullcourse)
-        self.assertNotIn('edxnotes', test_model)
-
-    @patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': False})
-    def test_validate_update_filtered_edxnotes_off(self):
-        """
-        If feature flag is off, then edxnotes must be filtered.
-        """
-        # pylint: disable=unused-variable
-        is_valid, errors, test_model = CourseMetadata.validate_and_update_from_json(
-            self.course,
-            {
-                "edxnotes": {"value": "true"},
-            },
-            user=self.user
-        )
-        self.assertNotIn('edxnotes', test_model)
-
-    @patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
-    def test_validate_update_filtered_edxnotes_on(self):
-        """
-        If feature flag is on, then edxnotes must not be filtered.
-        """
-        # pylint: disable=unused-variable
-        is_valid, errors, test_model = CourseMetadata.validate_and_update_from_json(
-            self.course,
-            {
-                "edxnotes": {"value": "true"},
-            },
-            user=self.user
-        )
-        self.assertIn('edxnotes', test_model)
-
-    @patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
-    def test_update_from_json_filtered_edxnotes_on(self):
-        """
-        If feature flag is on, then edxnotes must be updated.
-        """
-        test_model = CourseMetadata.update_from_json(
-            self.course,
-            {
-                "edxnotes": {"value": "true"},
-            },
-            user=self.user
-        )
-        self.assertIn('edxnotes', test_model)
-
-    @patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': False})
-    def test_update_from_json_filtered_edxnotes_off(self):
-        """
-        If feature flag is off, then edxnotes must not be updated.
-        """
-        test_model = CourseMetadata.update_from_json(
-            self.course,
-            {
-                "edxnotes": {"value": "true"},
-            },
-            user=self.user
-        )
-        self.assertNotIn('edxnotes', test_model)
-
     @patch.dict(settings.FEATURES, {'ENABLE_OTHER_COURSE_SETTINGS': True})
     def test_othercoursesettings_present(self):
         """
@@ -1466,7 +1392,6 @@ def test_http_update_from_json(self):
         self.assertIn('advertised_start', test_model, 'Missing revised advertised_start metadata field')
         self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value")
 
-    @patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
     @patch('xmodule.util.xmodule_django.get_current_request')
     def test_post_settings_with_staff_not_enrolled(self, mock_request):
         """
diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py
index c66f5b65e4c9..a998f4ca0b7e 100644
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/cms/djangoapps/models/settings/course_metadata.py
@@ -87,6 +87,10 @@ class CourseMetadata:
         "upstream_version",
         "upstream_version_declined",
         "upstream_display_name",
+
+        # Settings that are being handled through course plugin (Pages & Resources)
+        "edxnotes",
+        "show_calculator",
     ]
 
     @classmethod
@@ -102,10 +106,6 @@ def get_exclude_list_of_fields(cls, course_key):
         if not toggles.EXPORT_GIT.is_enabled():
             exclude_list.append('giturl')
 
-        # Do not show edxnotes if the feature is disabled.
-        if not settings.FEATURES.get('ENABLE_EDXNOTES'):
-            exclude_list.append('edxnotes')
-
         # Do not show video auto advance if the feature is disabled
         if not settings.FEATURES.get('ENABLE_OTHER_COURSE_SETTINGS'):
             exclude_list.append('other_course_settings')