diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js
index 609a3ef74c..d95eea716e 100644
--- a/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js
+++ b/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js
@@ -68,7 +68,6 @@ const forms = {
         }
 
         if (injectedInputs) {
-          // TODO: Discuss how to handle settings from other plugins
           const extendedSettings = {
             sectionTitle: {
               id: getTrad('modalForm.custom-fields.advanced.settings.extended'),
diff --git a/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/index.js b/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/index.js
index be9ea42b8e..40dbddd5ad 100644
--- a/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/index.js
+++ b/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/index.js
@@ -14,7 +14,6 @@ const FormModalNavigationProvider = ({ children }) => {
       return {
         ...prevState,
         actionType: 'create',
-        // TODO: Create a new modalType on EXPANSION-245
         modalType: 'customField',
         attributeType,
         customFieldUid,