diff --git a/packages/studio-ui-codegen-react/lib/__tests__/amplify-ui-renderers/__snapshots__/primitives.test.ts.snap b/packages/studio-ui-codegen-react/lib/__tests__/amplify-ui-renderers/__snapshots__/primitives.test.ts.snap
index 53bbb3500..ffdd2e529 100644
--- a/packages/studio-ui-codegen-react/lib/__tests__/amplify-ui-renderers/__snapshots__/primitives.test.ts.snap
+++ b/packages/studio-ui-codegen-react/lib/__tests__/amplify-ui-renderers/__snapshots__/primitives.test.ts.snap
@@ -16,12 +16,6 @@ exports[`Primitives Collection 1`] = `"<Collection items={items || []} {...rest}
 
 exports[`Primitives Divider 1`] = `"<Divider {...rest} {...getOverrideProps(overrides, \\"Divider\\")}></Divider>"`;
 
-exports[`Primitives FieldGroup 1`] = `"<FieldGroup {...rest} {...getOverrideProps(overrides, \\"FieldGroup\\")}></FieldGroup>"`;
-
-exports[`Primitives FieldGroupIcon 1`] = `"<FieldGroupIcon {...rest} {...getOverrideProps(overrides, \\"FieldGroupIcon\\")}></FieldGroupIcon>"`;
-
-exports[`Primitives FieldGroupIconButton 1`] = `"<FieldGroupIconButton {...rest} {...getOverrideProps(overrides, \\"FieldGroupIconButton\\")}></FieldGroupIconButton>"`;
-
 exports[`Primitives Flex 1`] = `"<Flex {...rest} {...getOverrideProps(overrides, \\"Flex\\")}></Flex>"`;
 
 exports[`Primitives Grid 1`] = `"<Grid {...rest} {...getOverrideProps(overrides, \\"Grid\\")}></Grid>"`;
diff --git a/packages/studio-ui-codegen-react/lib/amplify-ui-renderers/amplify-renderer.ts b/packages/studio-ui-codegen-react/lib/amplify-ui-renderers/amplify-renderer.ts
index 0e1d74a85..4148ce20e 100644
--- a/packages/studio-ui-codegen-react/lib/amplify-ui-renderers/amplify-renderer.ts
+++ b/packages/studio-ui-codegen-react/lib/amplify-ui-renderers/amplify-renderer.ts
@@ -24,8 +24,6 @@ import {
   CardProps,
   CheckboxFieldProps,
   DividerProps,
-  FieldGroupIconProps,
-  FieldGroupIconButtonProps,
   FlexProps,
   GridProps,
   HeadingProps,
@@ -116,28 +114,6 @@ export class AmplifyRenderer extends ReactStudioTemplateRenderer {
       case Primitive.Divider:
         return new ReactComponentRenderer<DividerProps>(component, this.importCollection, parent).renderElement();
 
-      case Primitive.FieldGroup:
-        // TODO: Use correct prop type
-        return new ReactComponentWithChildrenRenderer<ViewProps>(
-          component,
-          this.importCollection,
-          parent,
-        ).renderElement(renderChildren);
-
-      case Primitive.FieldGroupIcon:
-        return new ReactComponentWithChildrenRenderer<FieldGroupIconProps>(
-          component,
-          this.importCollection,
-          parent,
-        ).renderElement(renderChildren);
-
-      case Primitive.FieldGroupIconButton:
-        return new ReactComponentWithChildrenRenderer<FieldGroupIconButtonProps>(
-          component,
-          this.importCollection,
-          parent,
-        ).renderElement(renderChildren);
-
       case Primitive.Flex:
         return new ReactComponentWithChildrenRenderer<FlexProps>(
           component,
diff --git a/packages/studio-ui-codegen-react/lib/primitive.ts b/packages/studio-ui-codegen-react/lib/primitive.ts
index 7f73f0eb5..19238a56c 100644
--- a/packages/studio-ui-codegen-react/lib/primitive.ts
+++ b/packages/studio-ui-codegen-react/lib/primitive.ts
@@ -22,9 +22,6 @@ enum Primitive {
   CheckboxField = 'CheckboxField',
   Collection = 'Collection',
   Divider = 'Divider',
-  FieldGroup = 'FieldGroup',
-  FieldGroupIcon = 'FieldGroupIcon',
-  FieldGroupIconButton = 'FieldGroupIconButton',
   Flex = 'Flex',
   Grid = 'Grid',
   Heading = 'Heading',
diff --git a/packages/test-generator/integration-test-templates/src/PrimitivesTests.tsx b/packages/test-generator/integration-test-templates/src/PrimitivesTests.tsx
index b31bebd4c..e7b5f803c 100644
--- a/packages/test-generator/integration-test-templates/src/PrimitivesTests.tsx
+++ b/packages/test-generator/integration-test-templates/src/PrimitivesTests.tsx
@@ -8,9 +8,6 @@ import CardPrimitive from './ui-components/CardPrimitive';
 import CheckboxFieldPrimitive from './ui-components/CheckboxFieldPrimitive';
 import CollectionPrimitive from './ui-components/CollectionPrimitive';
 import DividerPrimitive from './ui-components/DividerPrimitive';
-import FieldGroupPrimitive from './ui-components/FieldGroupPrimitive';
-import FieldGroupIconPrimitive from './ui-components/FieldGroupIconPrimitive';
-import FieldGroupIconButtonPrimitive from './ui-components/FieldGroupIconButtonPrimitive';
 import FlexPrimitive from './ui-components/FlexPrimitive';
 import GridPrimitive from './ui-components/GridPrimitive';
 import HeadingPrimitive from './ui-components/HeadingPrimitive';
@@ -51,9 +48,6 @@ export default function PrimitivesTests() {
       <CheckboxFieldPrimitive />
       <CollectionPrimitive />
       <DividerPrimitive />
-      <FieldGroupPrimitive />
-      <FieldGroupIconPrimitive />
-      <FieldGroupIconButtonPrimitive />
       <FlexPrimitive />
       <GridPrimitive />
       <HeadingPrimitive />
diff --git a/packages/test-generator/lib/components/primitives/FieldGroupIconButtonPrimitive.json b/packages/test-generator/lib/components/primitives/FieldGroupIconButtonPrimitive.json
deleted file mode 100644
index fb119775c..000000000
--- a/packages/test-generator/lib/components/primitives/FieldGroupIconButtonPrimitive.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": "1234-5678-9010",
-  "componentType": "FieldGroupIconButton",
-  "name": "FieldGroupIconButtonPrimitive",
-  "properties": {}
-}
diff --git a/packages/test-generator/lib/components/primitives/FieldGroupIconPrimitive.json b/packages/test-generator/lib/components/primitives/FieldGroupIconPrimitive.json
deleted file mode 100644
index 31eb26a7f..000000000
--- a/packages/test-generator/lib/components/primitives/FieldGroupIconPrimitive.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": "1234-5678-9010",
-  "componentType": "FieldGroupIcon",
-  "name": "FieldGroupIconPrimitive",
-  "properties": {}
-}
diff --git a/packages/test-generator/lib/components/primitives/FieldGroupPrimitive.json b/packages/test-generator/lib/components/primitives/FieldGroupPrimitive.json
deleted file mode 100644
index 67de67fe6..000000000
--- a/packages/test-generator/lib/components/primitives/FieldGroupPrimitive.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": "1234-5678-9010",
-  "componentType": "FieldGroup",
-  "name": "FieldGroupPrimitive",
-  "properties": {}
-}
diff --git a/packages/test-generator/lib/components/primitives/index.ts b/packages/test-generator/lib/components/primitives/index.ts
index f592383f9..f6f91bddc 100644
--- a/packages/test-generator/lib/components/primitives/index.ts
+++ b/packages/test-generator/lib/components/primitives/index.ts
@@ -21,9 +21,6 @@ export { default as CardPrimitive } from './CardPrimitive.json';
 export { default as CheckboxFieldPrimitive } from './CheckboxFieldPrimitive.json';
 export { default as CollectionPrimitive } from './CollectionPrimitive.json';
 export { default as DividerPrimitive } from './DividerPrimitive.json';
-export { default as FieldGroupPrimitive } from './FieldGroupPrimitive.json';
-export { default as FieldGroupIconPrimitive } from './FieldGroupIconPrimitive.json';
-export { default as FieldGroupIconButtonPrimitive } from './FieldGroupIconButtonPrimitive.json';
 export { default as FlexPrimitive } from './FlexPrimitive.json';
 export { default as GridPrimitive } from './GridPrimitive.json';
 export { default as HeadingPrimitive } from './HeadingPrimitive.json';