diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeOption/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeOption/index.js
index 02f16ea53e..9efae86ff7 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeOption/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeOption/index.js
@@ -71,7 +71,7 @@ const AttributeOption = forwardRef(({ tabIndex, type }, ref) => {
       targetUid,
       attributeType: type,
       step: type === 'component' ? '1' : null,
-      subTargetUid: query.get('subTargetUid'),
+
       header_label_1,
       header_info_name_1,
       header_info_category_1,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/Header.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/Header.js
deleted file mode 100644
index 0603b5393e..0000000000
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/Header.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import UpperFirst from '../UpperFirst';
-import ComponentInfos from './ComponentInfos';
-import IconWrapper from './IconWrapper';
-
-const Header = ({
-  category,
-  name,
-  subCategory,
-  target,
-  targetUid,
-  subTargetUid,
-}) => {
-  const shouldDisplayComponentCatInfos = target === 'components';
-
-  const content = (
-    <>
-      <span>
-        <UpperFirst content={category} />
-      </span>
-      <IconWrapper>
-        <FontAwesomeIcon icon="chevron-right" />
-      </IconWrapper>
-      {subCategory && (
-        <>
-          <span>
-            <UpperFirst content={subCategory} />
-          </span>
-          <ComponentInfos uid={subTargetUid} />
-          <IconWrapper>
-            <FontAwesomeIcon icon="chevron-right" />
-          </IconWrapper>
-        </>
-      )}
-    </>
-  );
-
-  return (
-    <>
-      {category && content}
-      <span>
-        <UpperFirst content={name} />
-      </span>
-      {shouldDisplayComponentCatInfos && <ComponentInfos uid={targetUid} />}
-    </>
-  );
-};
-
-Header.defaultProps = {
-  category: null,
-  name: null,
-  subCategory: null,
-  subTargetUid: null,
-  target: null,
-  targetUid: null,
-};
-
-Header.propTypes = {
-  category: PropTypes.string,
-  name: PropTypes.string,
-  subCategory: PropTypes.string,
-  subTargetUid: PropTypes.string,
-  target: PropTypes.string,
-  targetUid: PropTypes.string,
-};
-
-export default Header;
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
index 387bf7ea58..3daf815e4d 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
@@ -85,7 +85,6 @@ const FormModal = () => {
       const modalType = query.get('modalType');
       const targetUid = query.get('targetUid');
       const settingType = query.get('settingType');
-      const subTargetUid = query.get('subTargetUid');
       const headerId = query.get('headerId');
       const header_label_1 = query.get('header_label_1');
       const header_icon_name_1 = query.get('header_icon_name_1');
@@ -127,7 +126,6 @@ const FormModal = () => {
         modalType,
         pathToSchema,
         settingType,
-        subTargetUid,
         step,
         targetUid,
         header_label_1,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/staticData.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/staticData.js
index 9fe552c069..a782f34dfd 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/staticData.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/staticData.js
@@ -10,7 +10,6 @@ const INITIAL_STATE_DATA = {
   pathToSchema: [],
   settingType: null,
   step: null,
-  subTargetUid: null,
   targetUid: null,
   headerId: null,
   header_label_1: null,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/tests/createHeadersArray.test.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/tests/createHeadersArray.test.js
index 379e31c98f..342298fc92 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/tests/createHeadersArray.test.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/tests/createHeadersArray.test.js
@@ -12,7 +12,6 @@ describe('FormModal | utils | createHeadersArray', () => {
       pathToSchema: [],
       settingType: null,
       step: null,
-      subTargetUid: null,
       targetUid: null,
       headerId: null,
       header_label_1: null,
@@ -47,7 +46,6 @@ describe('FormModal | utils | createHeadersArray', () => {
       pathToSchema: [],
       settingType: null,
       step: null,
-      subTargetUid: null,
       targetUid: null,
       headerId: null,
       header_label_1: 'restaurant',
@@ -95,7 +93,7 @@ describe('FormModal | utils | createHeadersArray', () => {
       pathToSchema: [],
       settingType: null,
       step: null,
-      subTargetUid: null,
+
       targetUid: null,
       headerId: null,
       header_label_1: 'restaurant',