diff --git a/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableComponent/index.js b/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableComponent/index.js
index 85bb5061a6..f3f3c86dec 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableComponent/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableComponent/index.js
@@ -45,8 +45,8 @@ const NonRepeatableComponent = ({ componentUid, isFromDynamicZone, name }) => {
                 <div key={fieldName} className={`col-${size}`}>
                   <Inputs
                     keys={keys}
-                    layout={componentLayoutData}
-                    name={fieldName}
+                    fieldSchema={fieldSchema}
+                    metadatas={metadatas}
                     componentUid={componentUid}
                     queryInfos={queryInfos}
                   />
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem/index.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem/index.js
index 3b03776a7e..f9362c7aad 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem/index.js
@@ -19,7 +19,6 @@ import { connect, select } from './utils';
 
 const DraggedItem = ({
   componentFieldName,
-  componentUid,
   doesPreviousFieldContainErrorsAndIsOpen,
   hasErrors,
   hasMinError,
@@ -201,10 +200,9 @@ const DraggedItem = ({
                         <div key={name} className={`col-${size}`}>
                           <Inputs
                             autoFocus={false}
-                            componentUid={componentUid}
+                            fieldSchema={fieldSchema}
                             keys={keys}
-                            layout={schema}
-                            name={name}
+                            metadatas={metadatas}
                             onBlur={hasErrors ? checkFormErrors : null}
                             queryInfos={queryInfos}
                           />
@@ -233,7 +231,6 @@ DraggedItem.defaultProps = {
 
 DraggedItem.propTypes = {
   componentFieldName: PropTypes.string.isRequired,
-  componentUid: PropTypes.string.isRequired,
   doesPreviousFieldContainErrorsAndIsOpen: PropTypes.bool,
   hasErrors: PropTypes.bool,
   hasMinError: PropTypes.bool,
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditView/index.js
index f0253382e6..b01bc83d9d 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/EditView/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditView/index.js
@@ -61,8 +61,6 @@ const EditView = ({ components, currentEnvironment, models, plugins, slug }) =>
     return <LoadingIndicatorPage />;
   }
 
-  console.log({ layout });
-
   return (
     <EditViewProvider
       allowedActions={allowedActions}