diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1d55892863..87cccfd1ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -335,12 +335,6 @@ jobs:
             # update readme.md
             sed -i -E "s/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+ \s*\| /| $NEW_VERSION                | $WCM_CORE_COMPONENTS_VERSION             | /g" README.md
 
-            # Check if package-lock.json is modified
-            if [[ $(git status --porcelain | grep "package-lock.json") ]]; then
-              # Discard the changes to package-lock.json (if needed)
-              git checkout -- '**/package-lock.json'
-            fi
-
             git add VERSIONS.md README.md
             git commit -m "Update VERSIONS.md and README.md to include version ${NEW_VERSION}"
             git push origin $RELEASE_BRANCH
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
index 1c1b3573b1..01bbc23604 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
@@ -50,9 +50,6 @@ private FormConstants() {
     /** The resource type for checkbox v1 */
     public static final String RT_FD_FORM_CHECKBOX_V1 = RT_FD_FORM_PREFIX + "checkbox/v1/checkbox";
 
-    /** The resource type for switch v1 */
-    public static final String RT_FD_FORM_SWITCH_V1 = RT_FD_FORM_PREFIX + "switch/v1/switch";
-
     /** The resource type for date picker v1 */
     public static final String RT_FD_FORM_DATE_PICKER_V1 = RT_FD_FORM_PREFIX + "datepicker/v1/datepicker";
 
@@ -111,9 +108,6 @@ private FormConstants() {
 
     public static final String RT_FD_FRAGMENT_CONTAINER_V1 = RT_FD_FORM_PREFIX + "fragmentcontainer/v1/fragmentcontainer";
 
-    /** The resource type for terms and conditions v1 */
-    public static final String RT_FD_FORM_TERMS_AND_CONDITIONS_V1 = RT_FD_FORM_PREFIX + "termsandconditions/v1/termsandconditions";
-
     public static final String FORM_FIELD_TYPE = "form";
 
     public static final String REQ_ATTR_FORMCONTAINER_PATH = "formContainerPath";
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImpl.java
index 92b66c8c14..ad9319b150 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImpl.java
@@ -1,5 +1,5 @@
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
+ ~ Copyright 2022 Adobe
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
@@ -15,16 +15,25 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package com.adobe.cq.forms.core.components.internal.models.v1.form;
 
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.annotation.PostConstruct;
+
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Exporter;
 import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
+import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
+import org.jetbrains.annotations.NotNull;
 
 import com.adobe.cq.export.json.ComponentExporter;
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.models.form.CheckBox;
-import com.adobe.cq.forms.core.components.util.AbstractCheckboxImpl;
+import com.adobe.cq.forms.core.components.util.AbstractOptionsFieldImpl;
+import com.adobe.cq.forms.core.components.util.ComponentUtils;
 
 @Model(
     adaptables = { SlingHttpServletRequest.class, Resource.class },
@@ -33,4 +42,54 @@
 @Exporter(
     name = ExporterConstants.SLING_MODEL_EXPORTER_NAME,
     extensions = ExporterConstants.SLING_MODEL_EXTENSION)
-public class CheckBoxImpl extends AbstractCheckboxImpl implements CheckBox {}
+public class CheckBoxImpl extends AbstractOptionsFieldImpl implements CheckBox {
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = "orientation")
+    @Nullable
+    protected String orientationJcr;
+    private Orientation orientation;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    private String checkedValue;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    private String uncheckedValue;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    private Boolean enableUncheckedValue;
+
+    @PostConstruct
+    private void initCheckBoxModel() {
+        orientation = Orientation.fromString(orientationJcr);
+        if (!Type.BOOLEAN.equals(type)) {
+            if (Boolean.TRUE.equals(enableUncheckedValue)) {
+                enums = new String[] { checkedValue, uncheckedValue };
+            } else {
+                enums = new String[] { checkedValue };
+            }
+        }
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getCustomLayoutProperties() {
+        Map<String, Object> customLayoutProperties = super.getCustomLayoutProperties();
+        if (orientation != null) {
+            customLayoutProperties.put("orientation", orientation);
+        }
+        return customLayoutProperties;
+    }
+
+    @Override
+    public Orientation getOrientation() {
+        return orientation;
+    }
+
+    @Override
+    public Object[] getEnums() {
+        if (enums == null) {
+            return null;
+        } else {
+            return ComponentUtils.coerce(type, enums);
+        }
+    }
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SwitchImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SwitchImpl.java
deleted file mode 100644
index 62ebeb09a5..0000000000
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SwitchImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package com.adobe.cq.forms.core.components.internal.models.v1.form;
-
-import javax.annotation.PostConstruct;
-
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.models.annotations.Exporter;
-import org.apache.sling.models.annotations.Model;
-
-import com.adobe.cq.export.json.ComponentExporter;
-import com.adobe.cq.export.json.ExporterConstants;
-import com.adobe.cq.forms.core.components.internal.form.FormConstants;
-import com.adobe.cq.forms.core.components.models.form.Switch;
-import com.adobe.cq.forms.core.components.util.AbstractCheckboxImpl;
-
-@Model(
-    adaptables = { SlingHttpServletRequest.class, Resource.class },
-    adapters = { Switch.class,
-        ComponentExporter.class },
-    resourceType = { FormConstants.RT_FD_FORM_SWITCH_V1 })
-@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
-public class SwitchImpl extends AbstractCheckboxImpl implements Switch {
-    @PostConstruct
-    public void initSwitchModel() {
-        if (enumNames != null) {
-            String[] enumNameArray = enumNames;
-            enumNames = Boolean.TRUE.equals(enableUncheckedValue) ? new String[] { enumNameArray[0], enumNameArray[1] }
-                : new String[] { enumNameArray[0] };
-        }
-    }
-}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java
deleted file mode 100644
index 63a81cc98c..0000000000
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-package com.adobe.cq.forms.core.components.internal.models.v1.form;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.models.annotations.Default;
-import org.apache.sling.models.annotations.Exporter;
-import org.apache.sling.models.annotations.Model;
-import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
-import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
-import org.jetbrains.annotations.NotNull;
-
-import com.adobe.cq.export.json.ComponentExporter;
-import com.adobe.cq.export.json.ExporterConstants;
-import com.adobe.cq.forms.core.components.internal.form.FormConstants;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
-import com.adobe.cq.forms.core.components.models.form.TermsAndConditions;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-@Model(
-    adaptables = { SlingHttpServletRequest.class, Resource.class },
-    adapters = { TermsAndConditions.class,
-        ComponentExporter.class },
-    resourceType = { FormConstants.RT_FD_FORM_TERMS_AND_CONDITIONS_V1 })
-
-@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
-public class TermsAndConditionsImpl extends PanelImpl implements TermsAndConditions {
-
-    private static final String CUSTOM_TNC_PROPERTY = "fd:tnc";
-
-    private static final String FIELD_TYPE = "fieldType";
-
-    @JsonIgnore
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
-    @Default(booleanValues = true)
-    private boolean showApprovalOption;
-
-    @JsonIgnore
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
-    @Default(booleanValues = false)
-    private boolean showLink;
-
-    @JsonIgnore
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
-    @Default(booleanValues = false)
-    private boolean showAsPopup;
-
-    @Override
-    public boolean isShowApprovalOption() {
-        return showApprovalOption;
-    }
-
-    @Override
-    public boolean isShowLink() {
-        return showLink;
-    }
-
-    @Override
-    public boolean isShowAsPopup() {
-        return showAsPopup;
-    }
-
-    @Override
-    public @NotNull String getId() {
-        return super.getId();
-    }
-
-    @Override
-    public @NotNull Map<String, Object> getProperties() {
-        Map<String, Object> properties = super.getProperties();
-        if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) {
-            properties.put(CUSTOM_TNC_PROPERTY, true);
-        }
-        return properties;
-    }
-
-    @Override
-    protected List<Resource> getFilteredChildrenResources() {
-        List<Resource> childResources = getFilteredChildrenResources(resource);
-        // the tnc component will either have links or consent text based upon showLink value
-        if (showLink) {
-            childResources.removeIf(child -> FieldType.PLAIN_TEXT.getValue().equals(child.getValueMap().get(FIELD_TYPE)));
-
-        } else {
-            childResources.removeIf(child -> FieldType.CHECKBOX_GROUP.getValue().equals(child.getValueMap().get(FIELD_TYPE)));
-        }
-        return childResources;
-    }
-}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java
index 05f75471e6..a7106b9f97 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Label.java
@@ -21,10 +21,21 @@
 /**
  * Interface for a label
  *
- * @since com.adobe.cq.forms.core.components.models.form 4.6.0
+ * @since com.adobe.cq.forms.core.components.models.form 0.0.1
  */
 @ConsumerType
-public interface Label extends TextContent {
+public interface Label {
+
+    /**
+     * Returns {@code true} if label is rich text, otherwise {@code false}.
+     *
+     * @return {@code true} if label is rich text, otherwise {@code false}
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    @Nullable
+    default Boolean isRichText() {
+        return null;
+    }
 
     /**
      * Returns {@code true} if label should be visible, otherwise {@code false}.
@@ -37,4 +48,15 @@ default Boolean isVisible() {
         return null;
     }
 
+    /**
+     * Returns the value of this label.
+     *
+     * @return the value of this label
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    @Nullable
+    default String getValue() {
+        return null;
+    }
+
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java
index 93770a63bd..2b949352d7 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/OptionsConstraint.java
@@ -17,7 +17,6 @@
 
 import org.osgi.annotation.versioning.ProviderType;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -58,17 +57,5 @@ default boolean isEnforceEnum() {
      * @return the list of enum names
      * @since com.adobe.cq.forms.core.components.models.form 0.0.1
      */
-    @Deprecated
-    @JsonIgnore
     String[] getEnumNames();
-
-    /**
-     * Returns a list of RichText to be displayed to the end user.
-     * The length of enum and enumNames array must match
-     *
-     * @return the list of enum names
-     * @since com.adobe.cq.forms.core.components.models.form 4.6.0
-     */
-    @JsonProperty("enumNames")
-    TextContent[] getEnumNamesAsTextContent();
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Switch.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Switch.java
deleted file mode 100644
index 9b4f4b9c6c..0000000000
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Switch.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package com.adobe.cq.forms.core.components.models.form;
-
-import org.osgi.annotation.versioning.ConsumerType;
-
-/**
- * Defines the {@code Switch} Sling Model used for the {@code /apps/core/fd/components/form/switch} component.
- *
- * @since com.adobe.cq.forms.core.components.models 4.7.0
- */
-@ConsumerType
-public interface Switch extends CheckBox {}
\ No newline at end of file
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TermsAndConditions.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TermsAndConditions.java
deleted file mode 100644
index 957877b9b2..0000000000
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TermsAndConditions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-package com.adobe.cq.forms.core.components.models.form;
-
-import org.osgi.annotation.versioning.ConsumerType;
-
-/**
- * Defines the form {@code TermsAndConditions} Sling Model used for the
- * {@code /apps/core/fd/components/form/termsandconditions/v1/termsandconditions} component.
- *
- * @since com.adobe.cq.forms.core.components.models.form 4.7.0
- */
-@ConsumerType
-public interface TermsAndConditions extends Container, ContainerConstraint {
-
-    String FD_TERMS_AND_CONDITIONS = "fd:tnc";
-
-    /**
-     *
-     * @return {@code true} if approval checkbox should be shown, otherwise {@code false}
-     */
-    boolean isShowApprovalOption();
-
-    /**
-     *
-     * @return {@code true} if links to external Terms & Conditions pages are to be shown, otherwise
-     *         {@code false if consent text is to be shown}
-     */
-    boolean isShowLink();
-
-    /**
-     *
-     * @return @return {@code true} if the content is to be shown as pop-up , otherwise {@code false}
-     */
-    boolean isShowAsPopup();
-}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TextContent.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TextContent.java
deleted file mode 100644
index 30b7006263..0000000000
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TextContent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package com.adobe.cq.forms.core.components.models.form;
-
-import org.jetbrains.annotations.Nullable;
-import org.osgi.annotation.versioning.ProviderType;
-
-/**
- * Interface to represent text as rich content
- *
- * @since com.adobe.cq.forms.core.components.models.form 4.6.0
- */
-@ProviderType
-public interface TextContent {
-
-    /**
-     * Returns {@code true} if text is rich, otherwise {@code false}.
-     *
-     * @return {@code true} if text is rich, otherwise {@code false}
-     * @since com.adobe.cq.forms.core.components.models.form 4.6.0
-     */
-    @Nullable
-    default Boolean isRichText() {
-        return null;
-    }
-
-    /**
-     * Returns a user friendly text to display for the possible options to be shown to the end user.
-     *
-     * @return the content of this text
-     * @since com.adobe.cq.forms.core.components.models.form 4.6.0
-     */
-    @Nullable
-    default String getValue() {
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
index 1aacc8966b..569a0f2118 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
@@ -34,7 +34,7 @@
  * version, is bound to this proxy component resource type.
  * </p>
  */
-@Version("4.7.0")
+@Version("4.5.0")
 package com.adobe.cq.forms.core.components.models.form;
 
 import org.osgi.annotation.versioning.Version;
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCheckboxImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCheckboxImpl.java
deleted file mode 100644
index 7059695145..0000000000
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCheckboxImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package com.adobe.cq.forms.core.components.util;
-
-import javax.annotation.PostConstruct;
-
-import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
-import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
-
-import com.adobe.cq.forms.core.components.models.form.Base;
-
-/**
- * Abstract class which can be used as base class for {@link Base} implementations.
- */
-public abstract class AbstractCheckboxImpl extends AbstractOptionsFieldImpl {
-
-    // when a checkbox is not checked, it will still have a value representing its unchecked state, rather than having
-    // a null value. This configuration allows for a distinct value when the checkbox is in an unchecked state.
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = "enableUncheckedValue")
-    protected Boolean enableUncheckedValue;
-
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
-    private String checkedValue;
-
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
-    private String uncheckedValue;
-
-    @PostConstruct
-    public void initBaseCheckboxModel() {
-        if (enums != null) {
-            checkedValue = String.valueOf(getEnums()[0]);
-            uncheckedValue = getEnums().length > 1 ? String.valueOf(getEnums()[1]) : null;
-        }
-        enums = (checkedValue != null) ? (Boolean.TRUE.equals(enableUncheckedValue)) ? new String[] { checkedValue, uncheckedValue }
-            : new String[] { checkedValue } : null;
-    }
-
-    @Override
-    public Object[] getEnums() {
-        if (enums == null) {
-            return null;
-        } else {
-            return ComponentUtils.coerce(type, enums);
-        }
-    }
-}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java
index 10dabbbd46..31fd23f66a 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java
@@ -29,9 +29,6 @@
 
 import com.adobe.cq.forms.core.components.models.form.Field;
 import com.adobe.cq.forms.core.components.models.form.OptionsConstraint;
-import com.adobe.cq.forms.core.components.models.form.TextContent;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * Abstract class which can be used as base class for options {@link Field} implementations.
@@ -50,11 +47,7 @@ public abstract class AbstractOptionsFieldImpl extends AbstractFieldImpl impleme
 
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = "enumNames")
     @Nullable
-    protected String[] enumNames;
-
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = "areOptionsRichText")
-    @Nullable
-    private Boolean areOptionsRichText;
+    private String[] enumNames;
 
     @Override
     public boolean isEnforceEnum() {
@@ -102,8 +95,6 @@ public Object[] getEnums() {
     }
 
     @Override
-    @Deprecated
-    @JsonIgnore
     public String[] getEnumNames() {
         if (enumNames != null) {
             Map<Object, String> map = removeDuplicates();
@@ -117,29 +108,6 @@ public String[] getEnumNames() {
         return null;
     }
 
-    @Override
-    public TextContent[] getEnumNamesAsTextContent() {
-        if (enumNames != null) {
-            Map<Object, String> map = removeDuplicates();
-            String[] enumName = map.values().toArray(new String[0]);
-            return Arrays.stream(enumName)
-                .map(p -> new TextContent() {
-                    @Override
-                    @JsonInclude(JsonInclude.Include.NON_NULL)
-                    public @Nullable Boolean isRichText() {
-                        return areOptionsRichText;
-                    }
-
-                    @Override
-                    public @Nullable String getValue() {
-                        return translate("enumNames", p);
-                    }
-                })
-                .toArray(TextContent[]::new);
-        }
-        return null;
-    }
-
     @Override
     public Object[] getDefault() {
         Object[] typedDefaultValue = null;
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java
index 2a47560728..8f887346e4 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java
@@ -25,7 +25,6 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -295,44 +294,6 @@ void testGetType() {
     void testGetEnumNames() {
         CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP);
         assertArrayEquals(new String[] { "m", "f", "o" }, checkboxGroup.getEnumNames());
-        TextContent textContent1 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "m";
-            }
-        };
-        TextContent textContent2 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "f";
-            }
-        };
-        TextContent textContent3 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "o";
-            }
-        };
-        TextContent[] textContent = new TextContent[] { textContent1, textContent2, textContent3 };
-        for (int i = 0; i < checkboxGroup.getEnumNamesAsTextContent().length; i++) {
-            assertEquals(textContent[i].getValue(), checkboxGroup.getEnumNamesAsTextContent()[i].getValue());
-            assertEquals(textContent[i].isRichText(), checkboxGroup.getEnumNamesAsTextContent()[i].isRichText());
-        }
     }
 
     @Test
@@ -343,9 +304,6 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("1", "Item 2");
         map.put("0", "Item 3");
         assertArrayEquals(map.values().toArray(new String[0]), checkboxGroup.getEnumNames());
-        String[] checkboxGroupValues = Arrays.stream(checkboxGroup.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[checkboxGroup.getEnumNamesAsTextContent().length]);
-        assertArrayEquals(map.values().toArray(new String[0]), checkboxGroupValues);
     }
 
     @Test
@@ -419,8 +377,5 @@ void testInsertionOrderForEnumNames() {
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
         assertArrayEquals(set.toArray(new String[0]), checkboxGroup.getEnumNames());
-        String[] checkboxGroupValues = Arrays.stream(checkboxGroup.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[checkboxGroup.getEnumNamesAsTextContent().length]);
-        assertArrayEquals(set.toArray(new String[0]), checkboxGroupValues);
     }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java
index b3d8c6efbb..071ce8d418 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java
@@ -27,8 +27,12 @@
 
 import com.adobe.cq.forms.core.Utils;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
-import com.adobe.cq.forms.core.components.models.form.*;
+import com.adobe.cq.forms.core.components.models.form.Base;
+import com.adobe.cq.forms.core.components.models.form.CheckBox;
 import com.adobe.cq.forms.core.components.models.form.CheckBox.Orientation;
+import com.adobe.cq.forms.core.components.models.form.ConstraintType;
+import com.adobe.cq.forms.core.components.models.form.FieldType;
+import com.adobe.cq.forms.core.components.models.form.Label;
 import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
 import com.adobe.cq.wcm.style.ComponentStyleInfo;
 import io.wcm.testing.mock.aem.junit5.AemContext;
@@ -305,16 +309,6 @@ void testGetEnum() {
 
     }
 
-    @Test
-    void testGetNullEnumNames() {
-        CheckBox checkbox = getCheckBoxUnderTest(PATH_CHECKBOX);
-        assertNull(checkbox.getEnumNamesAsTextContent());
-        assertNull(checkbox.getEnumNames());
-        CheckBox noEnumCheckbox = getCheckBoxUnderTest(PATH_CHECKBOX_NOENUM);
-        assertNull(noEnumCheckbox.getEnumNamesAsTextContent());
-        assertNull(noEnumCheckbox.getEnumNames());
-    }
-
     @Test
     void testGetNullEnum() {
         CheckBox noEnumCheckbox = getCheckBoxUnderTest(PATH_CHECKBOX_NOENUM);
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java
index ed9b4da4b1..824078c932 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java
@@ -25,7 +25,6 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -380,44 +379,6 @@ void testGetMultiSelectMaxItems() {
     void testGetEnumNames() {
         DropDown dropdown = Utils.getComponentUnderTest(PATH_DROPDOWN_1, DropDown.class, context);
         assertArrayEquals(new String[] { "m", "f", "o" }, dropdown.getEnumNames());
-        TextContent textContent1 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "m";
-            }
-        };
-        TextContent textContent2 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "f";
-            }
-        };
-        TextContent textContent3 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return null;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "o";
-            }
-        };
-        TextContent[] textContent = new TextContent[] { textContent1, textContent2, textContent3 };
-        for (int i = 0; i < dropdown.getEnumNamesAsTextContent().length; i++) {
-            assertEquals(textContent[i].getValue(), dropdown.getEnumNamesAsTextContent()[i].getValue());
-            assertEquals(textContent[i].isRichText(), dropdown.getEnumNamesAsTextContent()[i].isRichText());
-        }
     }
 
     @Test
@@ -428,10 +389,6 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("1", "Item 2");
         map.put("0", "Item 3");
         assertArrayEquals(map.values().toArray(new String[0]), dropdown.getEnumNames());
-        String[] dropdownValues = Arrays.stream(dropdown.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[dropdown
-                .getEnumNamesAsTextContent().length]);
-        assertArrayEquals(map.values().toArray(new String[0]), dropdownValues);
     }
 
     @Test
@@ -481,9 +438,5 @@ void testInsertionOrderForEnumNames() {
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
         assertArrayEquals(set.toArray(new String[0]), dropdown.getEnumNames());
-        String[] dropdownValues = Arrays.stream(dropdown.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[dropdown
-                .getEnumNamesAsTextContent().length]);
-        assertArrayEquals(set.toArray(new String[0]), dropdownValues);
     }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java
index 3df63727d1..22dcf6f74a 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java
@@ -24,7 +24,6 @@
 
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -308,42 +307,10 @@ void testGetType() {
         assertEquals(BaseConstraint.Type.STRING, radioButtonMock.getType());
     }
 
-    @Test
-    void testDeprecatedGetEnumNames() {
-        RadioButton radioButton = getRadioButtonUnderTest(PATH_RADIOBUTTON_CUSTOMIZED);
-        assertArrayEquals(new String[] { "<p>Item 1</p>", "<p>Item 2</p>" }, radioButton.getEnumNames());
-    }
-
     @Test
     void testGetEnumNames() {
         RadioButton radioButton = getRadioButtonUnderTest(PATH_RADIOBUTTON_CUSTOMIZED);
-        TextContent textContent1 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return true;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "<p>Item 1</p>";
-            }
-        };
-        TextContent textContent2 = new TextContent() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return true;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "<p>Item 2</p>";
-            }
-        };
-        TextContent[] textContent = new TextContent[] { textContent1, textContent2 };
-        for (int i = 0; i < radioButton.getEnumNamesAsTextContent().length; i++) {
-            assertEquals(textContent[i].getValue(), radioButton.getEnumNamesAsTextContent()[i].getValue());
-            assertEquals(textContent[i].isRichText(), radioButton.getEnumNamesAsTextContent()[i].isRichText());
-        }
+        assertArrayEquals(new String[] { "Item 1", "Item 2" }, radioButton.getEnumNames());
     }
 
     @Test
@@ -354,10 +321,6 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("1", "Item 2");
         map.put("0", "Item 3");
         assertArrayEquals(map.values().toArray(new String[0]), radioButton.getEnumNames());
-        String[] radioButtonValues = Arrays.stream(radioButton.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[radioButton
-                .getEnumNamesAsTextContent().length]);
-        assertArrayEquals(map.values().toArray(new String[0]), radioButtonValues);
     }
 
     @Test
@@ -426,9 +389,5 @@ void testInsertionOrderForEnumNames() {
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
         assertArrayEquals(set.toArray(new String[0]), radioButton.getEnumNames());
-        String[] radioButtonValues = Arrays.stream(radioButton.getEnumNamesAsTextContent()).map(d -> d.getValue()).toArray(
-            size -> new String[radioButton
-                .getEnumNamesAsTextContent().length]);
-        assertArrayEquals(set.toArray(new String[0]), radioButtonValues);
     }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SwitchImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SwitchImplTest.java
deleted file mode 100644
index 33c3f03ae3..0000000000
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SwitchImplTest.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package com.adobe.cq.forms.core.components.internal.models.v1.form;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mockito;
-
-import com.adobe.cq.forms.core.Utils;
-import com.adobe.cq.forms.core.components.internal.form.FormConstants;
-import com.adobe.cq.forms.core.components.models.form.*;
-import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
-import com.adobe.cq.wcm.style.ComponentStyleInfo;
-import io.wcm.testing.mock.aem.junit5.AemContext;
-import io.wcm.testing.mock.aem.junit5.AemContextExtension;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
-@ExtendWith(AemContextExtension.class)
-public class SwitchImplTest {
-    private static final String BASE = "/form/switch";
-    private static final String CONTENT_ROOT = "/content";
-    private static final String PATH_SWITCH = CONTENT_ROOT + "/switch";
-
-    private static final String PATH_SWITCH_CUSTOMIZED = CONTENT_ROOT + "/switch-customized";
-
-    private static final String PATH_SWITCH_ENABLEUNCHECKEDOFF = CONTENT_ROOT + "/switch-enableUncheckedValueFalse";
-    private static final String PATH_SWITCH_ENABLEUNCHECKED_BOOLEAN = CONTENT_ROOT + "/switch-boolean";
-    private static final String PATH_SWITCH_ENABLEUNCHECKEDOFF_BOOLEAN = CONTENT_ROOT + "/switch-enableUncheckedValueFalse-boolean";
-    private final AemContext context = FormsCoreComponentTestContext.newAemContext();
-
-    @BeforeEach
-    void setUp() {
-        context.load().json(BASE + FormsCoreComponentTestContext.TEST_CONTENT_JSON, CONTENT_ROOT);
-    }
-
-    @Test
-    void testExportedType() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(FormConstants.RT_FD_FORM_SWITCH_V1, switchObj.getExportedType());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getExportedType()).thenCallRealMethod();
-        assertEquals("", switchMock.getExportedType());
-    }
-
-    @Test
-    void testFieldType() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(FieldType.CHECKBOX.getValue(), switchObj.getFieldType());
-    }
-
-    @Test
-    void testGetLabel() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals("def", switchObj.getLabel().getValue());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getLabel()).thenCallRealMethod();
-        assertEquals(null, switchMock.getLabel());
-
-        Label labelMock = Mockito.mock(Label.class);
-        Mockito.when(labelMock.isRichText()).thenCallRealMethod();
-        assertEquals(null, labelMock.isRichText());
-        Mockito.when(labelMock.getValue()).thenCallRealMethod();
-        assertEquals(null, labelMock.getValue());
-        Mockito.when(labelMock.isVisible()).thenCallRealMethod();
-        assertEquals(null, labelMock.isVisible());
-    }
-
-    @Test
-    void testGetName() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals("abc", switchObj.getName());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getName()).thenCallRealMethod();
-        assertEquals(null, switchMock.getName());
-    }
-
-    @Test
-    void testGetDataRef() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals("a.b", switchObj.getDataRef());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getDataRef()).thenCallRealMethod();
-        assertEquals(null, switchMock.getDataRef());
-    }
-
-    @Test
-    void testGetDescription() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals("dummy", switchObj.getDescription());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getDescription()).thenCallRealMethod();
-        assertEquals(null, switchMock.getDescription());
-    }
-
-    @Test
-    void testGetScreenReaderText() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals("'Custom screen reader text'", switchObj.getScreenReaderText());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getScreenReaderText()).thenCallRealMethod();
-        assertEquals(null, switchMock.getScreenReaderText());
-    }
-
-    @Test
-    void testIsVisible() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(null, switchObj.isVisible());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isVisible()).thenCallRealMethod();
-        assertEquals(null, switchMock.isVisible());
-    }
-
-    @Test
-    void testIsVisibleForCustomizedSwitch() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH_CUSTOMIZED);
-        assertEquals(false, switchObj.isVisible());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isVisible()).thenCallRealMethod();
-        assertEquals(null, switchMock.isVisible());
-    }
-
-    @Test
-    void testIsEnabled() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(null, switchObj.isEnabled());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isEnabled()).thenCallRealMethod();
-        assertEquals(null, switchMock.isEnabled());
-    }
-
-    @Test
-    void testIsEnabledForCustomizedSwitch() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH_CUSTOMIZED);
-        assertEquals(false, switchObj.isEnabled());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isEnabled()).thenCallRealMethod();
-        assertEquals(null, switchMock.isEnabled());
-    }
-
-    @Test
-    void testIsReadOnly() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(null, switchObj.isReadOnly());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isReadOnly()).thenCallRealMethod();
-        assertEquals(null, switchMock.isReadOnly());
-    }
-
-    @Test
-    void testIsReadOnlyForCustomizedSwitch() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH_CUSTOMIZED);
-        assertEquals(true, switchObj.isReadOnly());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isReadOnly()).thenCallRealMethod();
-        assertEquals(null, switchMock.isReadOnly());
-    }
-
-    @Test
-    void testIsRequired() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(null, switchObj.isRequired());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isRequired()).thenCallRealMethod();
-        assertEquals(null, switchMock.isRequired());
-    }
-
-    @Test
-    void testIsRequiredForCustomizedSwitch() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH_CUSTOMIZED);
-        assertEquals(true, switchObj.isRequired());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isRequired()).thenCallRealMethod();
-        assertEquals(null, switchMock.isRequired());
-    }
-
-    @Test
-    void testGetPlaceHolder() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(null, switchObj.getPlaceHolder());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getPlaceHolder()).thenCallRealMethod();
-        assertEquals(null, switchMock.getPlaceHolder());
-    }
-
-    @Test
-    void testGetDisplayFormat() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(null, switchObj.getDisplayFormat());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getDisplayFormat()).thenCallRealMethod();
-        assertEquals(null, switchMock.getDisplayFormat());
-    }
-
-    @Test
-    void testGetEditFormat() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(null, switchObj.getEditFormat());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getEditFormat()).thenCallRealMethod();
-        assertEquals(null, switchMock.getEditFormat());
-    }
-
-    @Test
-    void testGetDataFormat() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals(null, switchObj.getDataFormat());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getDataFormat()).thenCallRealMethod();
-        assertEquals(null, switchMock.getDataFormat());
-    }
-
-    @Test
-    void testGetTooltip() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertEquals("test-short-description", switchObj.getTooltip());
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getTooltip()).thenCallRealMethod();
-        assertEquals(null, switchMock.getTooltip());
-    }
-
-    @Test
-    void testGetConstraintMessages() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        Map<ConstraintType, String> constraintsMessages = switchObj.getConstraintMessages();
-        assertEquals(constraintsMessages.get(ConstraintType.TYPE), "incorrect type");
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getConstraintMessages()).thenCallRealMethod();
-        assertEquals(Collections.emptyMap(), switchMock.getConstraintMessages());
-    }
-
-    @Test
-    void testJSONExport() throws Exception {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        Utils.testJSONExport(switchObj, Utils.getTestExporterJSONPath(BASE, PATH_SWITCH));
-    }
-
-    @Test
-    void testJSONExportForCustomized() throws Exception {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH_CUSTOMIZED);
-        Utils.testJSONExport(switchObj, Utils.getTestExporterJSONPath(BASE, PATH_SWITCH_CUSTOMIZED));
-    }
-
-    @Test
-    void testGetProperties() throws Exception {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        Map<String, Object> properties = switchObj.getProperties();
-        assertFalse(properties.isEmpty());
-        // get custom properties of "afs:layout"
-        Map<String, Object> customProperties = (Map<String, Object>) properties.get(Base.CUSTOM_PROPERTY_WRAPPER);
-        assertFalse((boolean) customProperties.get("tooltipVisible"));
-    }
-
-    @Test
-    void testGetProperties_should_return_empty_if_no_custom_properties() {
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getProperties()).thenCallRealMethod();
-        assertTrue(switchMock.getProperties().isEmpty());
-    }
-
-    @Test
-    void testGetShortDescription() {
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.getTooltip()).thenCallRealMethod();
-        assertEquals(null, switchMock.getTooltip());
-    }
-
-    @Test
-    void testIsShortDescriptionVisible() {
-        Switch switchMock = Mockito.mock(Switch.class);
-        Mockito.when(switchMock.isTooltipVisible()).thenCallRealMethod();
-        assertEquals(false, switchMock.isTooltipVisible());
-    }
-
-    @Test
-    void testGetEnum() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH);
-        assertArrayEquals(new String[] { "OFF", "ON" }, switchObj.getEnumNames());
-        assertArrayEquals(new String[] { "0", "1" }, switchObj.getEnums());
-    }
-
-    @Test
-    void testStyleSystemClasses() {
-        ComponentStyleInfo componentStyleInfoMock = mock(ComponentStyleInfo.class);
-        Resource resource = spy(context.resourceResolver().getResource(PATH_SWITCH));
-        Mockito.doReturn(componentStyleInfoMock).when(resource).adaptTo(ComponentStyleInfo.class);
-        MockSlingHttpServletRequest request = context.request();
-        request.setResource(resource);
-        Mockito.doReturn("mystyle").when(componentStyleInfoMock).getAppliedCssClasses();
-        Switch switchObj = request.adaptTo(Switch.class);
-        String appliedCssClasses = switchObj.getAppliedCssClasses();
-        assertEquals("mystyle", appliedCssClasses);
-    }
-
-    @Test
-    void shouldOnlyHaveOnEnumIfEnableUncheckedValueOff() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH_ENABLEUNCHECKEDOFF);
-        assertArrayEquals(new String[] { "1" }, switchObj.getEnums());
-    }
-
-    @Test
-    void shouldOnlyHaveOnEnumValueIfEnableUncheckedValueOff() {
-        Switch switchObj = getSwitchUnderTest(PATH_SWITCH_ENABLEUNCHECKEDOFF);
-        assertArrayEquals(new String[] { "ON" }, switchObj.getEnumNames());
-    }
-
-    @Test
-    void shouldOnlyHaveOnEnumAndEnumValueIfEnableUncheckedValueOffBoolean() {
-        Switch switchObjBool = getSwitchUnderTest(PATH_SWITCH_ENABLEUNCHECKEDOFF_BOOLEAN);
-        assertArrayEquals(new Boolean[] { true }, switchObjBool.getEnums());
-        assertArrayEquals(new String[] { "ON" }, switchObjBool.getEnumNames());
-    }
-
-    @Test
-    void shouldOnlyHaveOnEnumAndEnumValueIfEnableUncheckedValueOnBoolean() {
-        Switch switchObjBool = getSwitchUnderTest(PATH_SWITCH_ENABLEUNCHECKED_BOOLEAN);
-        assertArrayEquals(new Boolean[] { true, false }, switchObjBool.getEnums());
-        assertArrayEquals(new String[] { "true", "false" }, switchObjBool.getEnumNames());
-    }
-
-    private Switch getSwitchUnderTest(String resourcePath) {
-        context.currentResource(resourcePath);
-        MockSlingHttpServletRequest request = context.request();
-        return request.adaptTo(Switch.class);
-    }
-}
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java
deleted file mode 100644
index 57c936958b..0000000000
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package com.adobe.cq.forms.core.components.internal.models.v1.form;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import org.apache.sling.api.resource.Resource;
-import org.junit.Assert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mockito;
-
-import com.adobe.cq.export.json.SlingModelFilter;
-import com.adobe.cq.forms.core.Utils;
-import com.adobe.cq.forms.core.components.internal.form.FormConstants;
-import com.adobe.cq.forms.core.components.models.form.TermsAndConditions;
-import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
-import com.day.cq.wcm.api.NameConstants;
-import com.day.cq.wcm.msm.api.MSMNameConstants;
-import io.wcm.testing.mock.aem.junit5.AemContext;
-import io.wcm.testing.mock.aem.junit5.AemContextExtension;
-
-import static org.junit.Assert.assertEquals;
-
-@ExtendWith(AemContextExtension.class)
-public class TermsAndConditionsImplTest {
-
-    private static final String BASE = "/form/termsandconditions";
-    private static final String CONTENT_ROOT = "/content";
-
-    private static final String PATH_TNC = CONTENT_ROOT + "/termsandconditions";
-
-    private static final String PATH_NOWRAP_TNC = CONTENT_ROOT + "/termsandconditionsNoWrapData";
-
-    private final AemContext context = FormsCoreComponentTestContext.newAemContext();
-
-    @BeforeEach
-    public void setUp() {
-        context.load().json(BASE + FormsCoreComponentTestContext.TEST_CONTENT_JSON, CONTENT_ROOT);
-        context.registerService(SlingModelFilter.class, new SlingModelFilter() {
-
-            private final Set<String> IGNORED_NODE_NAMES = new HashSet<String>() {
-                {
-                    add(NameConstants.NN_RESPONSIVE_CONFIG);
-                    add(MSMNameConstants.NT_LIVE_SYNC_CONFIG);
-                    add("cq:annotations");
-                }
-            };
-
-            @Override
-            public Map<String, Object> filterProperties(Map<String, Object> map) {
-                return map;
-            }
-
-            @Override
-            public Iterable<Resource> filterChildResources(Iterable<Resource> childResources) {
-                return StreamSupport
-                    .stream(childResources.spliterator(), false)
-                    .filter(r -> !IGNORED_NODE_NAMES.contains(r.getName()))
-                    .collect(Collectors.toList());
-            }
-        });
-    }
-
-    @Test
-    void testExportedType() throws Exception {
-        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
-        assertEquals(FormConstants.RT_FD_FORM_TERMS_AND_CONDITIONS_V1, tnc.getExportedType());
-        TermsAndConditions tncMock = Mockito.mock(TermsAndConditions.class);
-        Mockito.when(tncMock.getExportedType()).thenCallRealMethod();
-        assertEquals("", tncMock.getExportedType());
-    }
-
-    @Test
-    public void testGetProperties() {
-        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
-        Assert.assertTrue(tnc.isShowApprovalOption());
-        Assert.assertTrue(tnc.isShowAsPopup());
-        Assert.assertFalse(tnc.isShowLink());
-    }
-
-    @Test
-    public void testCustomFDProperty() {
-        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
-        Map<String, Object> props = tnc.getProperties();
-        Assert.assertTrue(props.containsKey("fd:tnc"));
-        Assert.assertTrue((Boolean) props.get("fd:tnc"));
-
-    }
-
-    @Test
-    void testJSONExport() throws Exception {
-        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
-        Utils.testJSONExport(tnc, Utils.getTestExporterJSONPath(BASE, PATH_TNC));
-    }
-
-    @Test
-    void testJSONExport_showLink() throws Exception {
-        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_NOWRAP_TNC, TermsAndConditions.class, context);
-        Utils.testJSONExport(tnc, Utils.getTestExporterJSONPath(BASE, PATH_NOWRAP_TNC));
-    }
-
-    @Test
-    void testNoWrap() {
-        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_NOWRAP_TNC, TermsAndConditions.class, context);
-        Assert.assertNull(tnc.getType());
-    }
-}
diff --git a/bundles/af-core/src/test/resources/form/checkbox/exporter-checkbox-customized.json b/bundles/af-core/src/test/resources/form/checkbox/exporter-checkbox-customized.json
index ba7d14efd9..d5d240886f 100644
--- a/bundles/af-core/src/test/resources/form/checkbox/exporter-checkbox-customized.json
+++ b/bundles/af-core/src/test/resources/form/checkbox/exporter-checkbox-customized.json
@@ -26,7 +26,8 @@
   },
   "properties": {
     "afs:layout": {
-      "tooltipVisible": false
+      "tooltipVisible": false,
+      "orientation": "horizontal"
     },
     "fd:dor": {
       "dorExclusion": false
diff --git a/bundles/af-core/src/test/resources/form/checkbox/exporter-checkbox.json b/bundles/af-core/src/test/resources/form/checkbox/exporter-checkbox.json
index 4f31ccd987..557a88e2af 100644
--- a/bundles/af-core/src/test/resources/form/checkbox/exporter-checkbox.json
+++ b/bundles/af-core/src/test/resources/form/checkbox/exporter-checkbox.json
@@ -6,7 +6,8 @@
   "tooltip": "test-short-description",
   "properties": {
     "afs:layout" : {
-      "tooltipVisible": false
+      "tooltipVisible": false,
+      "orientation" : "horizontal"
     },
     "fd:dor": {
       "dorExclusion":false
diff --git a/bundles/af-core/src/test/resources/form/checkbox/test-content.json b/bundles/af-core/src/test/resources/form/checkbox/test-content.json
index fcd2a19b6d..b6a9622d3c 100644
--- a/bundles/af-core/src/test/resources/form/checkbox/test-content.json
+++ b/bundles/af-core/src/test/resources/form/checkbox/test-content.json
@@ -39,6 +39,7 @@
     "typeMessage" : "incorrect type",
     "tooltip": "test-short-description",
     "type" : "string",
+    "enum" : [true, false],
     "fieldType": "checkbox",
     "checkedValue":  "yes",
     "uncheckedValue": "no",
diff --git a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json
index de77a5d84f..986b3f2b6a 100644
--- a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json
+++ b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json
@@ -9,12 +9,8 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "Cat Person"
-    },
-    {
-      "value": "Dog Person"
-    }
+    "Cat Person",
+    "Dog Person"
   ],
   "label": {
     "value": "Personality"
diff --git a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup.json b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup.json
index f82ba6229a..b71aa10538 100644
--- a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup.json
+++ b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup.json
@@ -16,15 +16,9 @@
   "readOnly": true,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "m"
-    },
-    {
-      "value": "f"
-    },
-    {
-      "value": "o"
-    }
+    "m",
+    "f",
+    "o"
   ],
   "default": [
     0,
diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-1.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-1.json
index b20398a150..60987e7d27 100644
--- a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-1.json
+++ b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-1.json
@@ -15,15 +15,9 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "m"
-    },
-    {
-      "value": "f"
-    },
-    {
-      "value": "o"
-    }
+    "m",
+    "f",
+    "o"
   ],
   "label": {
     "visible": true,
diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json
index f02d9514a7..4b7d3b72e6 100644
--- a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json
+++ b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json
@@ -9,12 +9,8 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "Owl"
-    },
-    {
-      "value": "Wolf"
-    }
+    "Owl",
+    "Wolf"
   ],
   "label": {
     "value": "Favorite Animal"
diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json
index 64e232f04e..7ecce9aa4e 100644
--- a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json
+++ b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json
@@ -4,17 +4,7 @@
   "name": "abc",
   "type": "string",
   "enforceEnum": true,
-  "enumNames": [
-    {
-      "value": "m"
-    },
-    {
-      "value": "f"
-    },
-    {
-      "value": "o"
-    }
-  ],
+  "enumNames": ["m", "f", "o"],
   "enum": ["0", "1", "2"],
   "label": {
     "value": "def"
diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-multiselect-dropdown.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-multiselect-dropdown.json
index 9547715155..43860b3db0 100644
--- a/bundles/af-core/src/test/resources/form/dropdown/exporter-multiselect-dropdown.json
+++ b/bundles/af-core/src/test/resources/form/dropdown/exporter-multiselect-dropdown.json
@@ -15,15 +15,9 @@
   },
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "m"
-    },
-    {
-      "value": "f"
-    },
-    {
-      "value": "o"
-    }
+    "m",
+    "f",
+    "o"
   ],
   "default": [
     0,
diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json
index 7225f64b53..988424436a 100644
--- a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json
+++ b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json
@@ -16,14 +16,8 @@
   },
   "enforceEnum": true,
   "enumNames": [
-    {
-      "richText": true,
-      "value": "<p>Item 1</p>"
-    },
-    {
-      "richText": true,
-      "value": "<p>Item 2</p>"
-    }
+    "Item 1",
+    "Item 2"
   ],
   "default": "0",
   "screenReaderText": "'custom text'",
diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json
index 870734a41e..6662d77b6d 100644
--- a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json
+++ b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json
@@ -9,12 +9,8 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    {
-      "value": "Male"
-    },
-    {
-      "value": "Female"
-    }
+    "Male",
+    "Female"
   ],
   "label": {
     "value": "Gender"
diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json
index 9fd2561296..078687521f 100644
--- a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json
+++ b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json
@@ -5,14 +5,8 @@
   "type": "string",
   "enforceEnum": true,
   "enumNames": [
-    {
-      "richText": true,
-      "value": "<p>Item 1</p>"
-    },
-    {
-      "richText": true,
-      "value": "<p>Item 2</p>"
-    }
+    "Item 1",
+    "Item 2"
   ],
   "label": {
     "value": "Radio Button"
diff --git a/bundles/af-core/src/test/resources/form/radiobutton/test-content.json b/bundles/af-core/src/test/resources/form/radiobutton/test-content.json
index 076198ea4c..d68b10d0c8 100644
--- a/bundles/af-core/src/test/resources/form/radiobutton/test-content.json
+++ b/bundles/af-core/src/test/resources/form/radiobutton/test-content.json
@@ -8,14 +8,13 @@
     "orientation": "vertical",
     "jcr:lastModifiedBy": "admin",
     "jcr:created": "Tue Sep 13 2022 15:17:35 GMT+0530",
-    "areOptionsRichText": true,
     "enum": [
       "0",
       "1"
     ],
     "enumNames": [
-      "<p>Item 1</p>",
-      "<p>Item 2</p>"
+      "Item 1",
+      "Item 2"
     ],
     "jcr:lastModified": "Tue Sep 13 2022 15:18:50 GMT+0530",
     "fieldType": "radio-group"
@@ -38,15 +37,14 @@
     "dorColspan": "4",
     "assistPriority": "custom",
     "jcr:created": "Tue Sep 13 2022 15:17:35 GMT+0530",
-    "areOptionsRichText": true,
     "enum": [
       "0",
       "1"
     ],
     "type": "string",
     "enumNames": [
-      "<p>Item 1</p>",
-      "<p>Item 2</p>"
+      "Item 1",
+      "Item 2"
     ],
     "visible": false,
     "readOnly": true,
diff --git a/bundles/af-core/src/test/resources/form/switch/exporter-switch-customized.json b/bundles/af-core/src/test/resources/form/switch/exporter-switch-customized.json
deleted file mode 100644
index f928d561d6..0000000000
--- a/bundles/af-core/src/test/resources/form/switch/exporter-switch-customized.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "switch-eebab31c57",
-  "dataRef": "a.b",
-  "fieldType": "checkbox",
-  "name": "switch-customized",
-  "visible": false,
-  "description": "switch-customized",
-  "tooltip": "test-short-description",
-  "type": "string",
-  "required": true,
-  "enabled": false,
-  "constraintMessages": {
-    "type": "incorrect type"
-  },
-  "readOnly": true,
-  "enforceEnum": true,
-  "label": {
-    "visible": true,
-    "value": "switch-customized"
-  },
-  "screenReaderText": "'Custom screen reader text'",
-  "events": {
-    "custom:setProperty": [
-      "$event.payload"
-    ]
-  },
-  "properties": {
-    "afs:layout": {
-      "tooltipVisible": false
-    },
-    "fd:dor": {
-      "dorExclusion": false
-    },
-    "fd:path": "/content/switch-customized"
-  },
-  "enum": [
-    "0",
-    "1"
-  ],
-  "enumNames": [
-    {
-      "value": "OFF"
-    },
-    {
-      "value": "ON"
-    }
-  ],
-  ":type": "core/fd/components/form/switch/v1/switch"
-}
diff --git a/bundles/af-core/src/test/resources/form/switch/exporter-switch.json b/bundles/af-core/src/test/resources/form/switch/exporter-switch.json
deleted file mode 100644
index 4a173cf3d5..0000000000
--- a/bundles/af-core/src/test/resources/form/switch/exporter-switch.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  ":type": "core/fd/components/form/switch/v1/switch",
-  "constraintMessages": {
-    "type": "incorrect type"
-  },
-  "dataRef": "a.b",
-  "description": "dummy",
-  "enforceEnum": true,
-  "enum": [
-    "0",
-    "1"
-  ],
-  "enumNames": [
-    {
-      "value": "OFF"
-    },
-    {
-      "value": "ON"
-    }
-  ],
-  "events": {
-    "custom:setProperty": [
-      "$event.payload"
-    ]
-  },
-  "fieldType": "checkbox",
-  "id": "switch-db8ba77543",
-  "label": {
-    "value": "def"
-  },
-  "name": "abc",
-  "properties": {
-    "afs:layout": {
-      "tooltipVisible": false
-    },
-    "fd:dor": {
-      "dorExclusion": false
-    },
-    "fd:path": "/content/switch"
-  },
-  "screenReaderText": "'Custom screen reader text'",
-  "tooltip": "test-short-description",
-  "type": "string"
-}
\ No newline at end of file
diff --git a/bundles/af-core/src/test/resources/form/switch/test-content.json b/bundles/af-core/src/test/resources/form/switch/test-content.json
deleted file mode 100644
index f87337532b..0000000000
--- a/bundles/af-core/src/test/resources/form/switch/test-content.json
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-  "switch" : {
-    "jcr:primaryType": "nt:unstructured",
-    "sling:resourceType"    : "core/fd/components/form/switch/v1/switch",
-    "name" : "abc",
-    "jcr:title" : "def",
-    "description" : "dummy",
-    "assistPriority" : "custom",
-    "dataRef" : "a.b",
-    "custom" : "Custom screen reader text",
-    "typeMessage" : "incorrect type",
-    "tooltip": "test-short-description",
-    "type" : "string",
-    "enum": [
-      "0",
-      "1"
-    ],
-    "enumNames": [
-      "OFF",
-      "ON"
-    ],
-    "enableUncheckedValue": true,
-    "fieldType": "checkbox",
-    "fd:rules" : {
-      "jcr:primaryType": "nt:unstructured"
-    },
-    "fd:events" : {
-      "jcr:primaryType": "nt:unstructured"
-    }
-  },
-  "switch-customized" : {
-    "jcr:primaryType": "nt:unstructured",
-    "sling:resourceType"    : "core/fd/components/form/switch/v1/switch",
-    "name" : "switch-customized",
-    "jcr:title" : "switch-customized",
-    "description" : "switch-customized",
-    "visible" : false,
-    "enabled" : false,
-    "required" : true,
-    "readOnly" : true,
-    "hideTitle" : false,
-    "assistPriority" : "custom",
-    "dataRef" : "a.b",
-    "custom" : "Custom screen reader text",
-    "typeMessage" : "incorrect type",
-    "tooltip": "test-short-description",
-    "type" : "string",
-    "enum": [
-      "0",
-      "1"
-    ],
-    "enumNames": [
-      "OFF",
-      "ON"
-    ],
-    "fieldType": "checkbox",
-    "enableUncheckedValue": true,
-    "fd:rules" : {
-      "jcr:primaryType": "nt:unstructured"
-    },
-    "fd:events" : {
-      "jcr:primaryType": "nt:unstructured"
-    }
-  },
-  "switchNoEnum" : {
-    "jcr:primaryType": "nt:unstructured",
-    "sling:resourceType"    : "core/fd/components/form/switch/v1/switch",
-    "name" : "abc",
-    "jcr:title" : "def",
-    "description" : "dummy",
-    "assistPriority" : "custom",
-    "dataRef" : "a.b",
-    "custom" : "Custom screen reader text",
-    "typeMessage" : "incorrect type",
-    "tooltip": "test-short-description",
-    "type" : "boolean",
-    "fieldType": "checkbox",
-    "enum": [
-      "0",
-      "1"
-    ],
-    "enumNames": [
-      "OFF",
-      "ON"
-    ],
-    "fd:rules" : {
-      "jcr:primaryType": "nt:unstructured"
-    },
-    "fd:events" : {
-      "jcr:primaryType": "nt:unstructured"
-    }
-  },
-  "switch-enableUncheckedValueFalse" : {
-    "jcr:primaryType": "nt:unstructured",
-    "sling:resourceType"    : "core/fd/components/form/switch/v1/switch",
-    "name" : "abc",
-    "jcr:title" : "def",
-    "description" : "dummy",
-    "assistPriority" : "custom",
-    "dataRef" : "a.b",
-    "custom" : "Custom screen reader text",
-    "typeMessage" : "incorrect type",
-    "tooltip": "test-short-description",
-    "type" : "string",
-    "enum": [
-      "1"
-    ],
-    "enumNames": [
-      "ON"
-    ],
-    "enableUncheckedValue": false,
-    "fieldType": "checkbox",
-    "fd:rules" : {
-      "jcr:primaryType": "nt:unstructured"
-    },
-    "fd:events" : {
-      "jcr:primaryType": "nt:unstructured"
-    }
-  },
-  "switch-boolean" : {
-    "jcr:primaryType": "nt:unstructured",
-    "sling:resourceType"    : "core/fd/components/form/switch/v1/switch",
-    "name" : "abc",
-    "jcr:title" : "def",
-    "description" : "dummy",
-    "assistPriority" : "custom",
-    "dataRef" : "a.b",
-    "custom" : "Custom screen reader text",
-    "typeMessage" : "incorrect type",
-    "tooltip": "test-short-description",
-    "type" : "boolean",
-    "enum": [
-      true,
-      false
-    ],
-    "enumNames": [
-      "true",
-      "false"
-    ],
-    "enableUncheckedValue": true,
-    "fieldType": "checkbox",
-    "fd:rules" : {
-      "jcr:primaryType": "nt:unstructured"
-    },
-    "fd:events" : {
-      "jcr:primaryType": "nt:unstructured"
-    }
-  },
-  "switch-enableUncheckedValueFalse-boolean" : {
-    "jcr:primaryType": "nt:unstructured",
-    "sling:resourceType"    : "core/fd/components/form/switch/v1/switch",
-    "name" : "abc",
-    "jcr:title" : "def",
-    "description" : "dummy",
-    "assistPriority" : "custom",
-    "dataRef" : "a.b",
-    "custom" : "Custom screen reader text",
-    "typeMessage" : "incorrect type",
-    "tooltip": "test-short-description",
-    "type" : "boolean",
-    "enum": [
-      true
-    ],
-    "enumNames": [
-      "ON"
-    ],
-    "enableUncheckedValue": false,
-    "fieldType": "checkbox",
-    "fd:rules" : {
-      "jcr:primaryType": "nt:unstructured"
-    },
-    "fd:events" : {
-      "jcr:primaryType": "nt:unstructured"
-    }
-  }
-}
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json
deleted file mode 100644
index 9db7aecead..0000000000
--- a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "id": "termsandconditions-dac51d5ed9",
-  "fieldType": "panel",
-  "name": "termsandconditions1694159302516",
-  "type": "object",
-  "properties": {
-    "fd:dor": {
-      "dorExclusion": false,
-      "dorExcludeTitle": false,
-      "dorExcludeDescription": false
-    },
-    "fd:path": "/content/termsandconditions",
-    "fd:tnc": true
-  },
-  "label": {
-    "value": "Terms And Conditions"
-  },
-  "events": {
-    "custom:setProperty": [
-      "$event.payload"
-    ]
-  },
-  ":itemsOrder": [
-    "text",
-    "approvalcheckbox"
-  ],
-  ":items": {
-    "text": {
-      "id": "text-37c101fc2b",
-      "fieldType": "plain-text",
-      "name": "consenttext",
-      "value": "Text related to the terms and conditions come here",
-      "richText": false,
-      "events": {
-        "custom:setProperty": [
-          "$event.payload"
-        ]
-      },
-      "properties": {
-        "fd:path": "/content/termsandconditions/text"
-      },
-      ":type": "core/fd/components/form/text/v1/text"
-    },
-    "approvalcheckbox": {
-      "id": "checkbox-150eb94d3e",
-      "fieldType": "checkbox",
-      "name": "approvalcheckbox",
-      "type": "string",
-      "enabled": false,
-      "enforceEnum": true,
-      "label": {
-        "value": "I agree to the terms & conditions"
-      },
-      "events": {
-        "custom:setProperty": [
-          "$event.payload"
-        ]
-      },
-      "properties": {
-        "fd:dor": {
-          "dorExclusion": false
-        },
-        "fd:path": "/content/termsandconditions/approvalcheckbox"
-      },
-      "enum": [
-        "true"
-      ],
-      ":type": "core/fd/components/form/checkbox/v1/checkbox"
-    }
-  },
-  ":type": "core/fd/components/form/termsandconditions/v1/termsandconditions"
-}
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
deleted file mode 100644
index b7a56e1246..0000000000
--- a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "id": "termsandconditions-5e021cc31d",
-  "fieldType": "panel",
-  "name": "termsandconditions1694159302516",
-  "properties": {
-    "fd:dor": {
-      "dorExclusion": false,
-      "dorExcludeTitle": false,
-      "dorExcludeDescription": false
-    },
-    "fd:path": "/content/termsandconditionsNoWrapData",
-    "fd:tnc": true
-  },
-  "label": {
-    "value": "Terms And Conditions"
-  },
-  "events": {
-    "custom:setProperty": [
-      "$event.payload"
-    ]
-  },
-  ":itemsOrder": [
-    "approvalcheckbox",
-    "link"
-  ],
-  ":items": {
-    "approvalcheckbox": {
-      "id": "checkbox-9d01a4893a",
-      "fieldType": "checkbox",
-      "name": "approvalcheckbox",
-      "type": "string",
-      "enabled": false,
-      "enforceEnum": true,
-      "label": {
-        "value": "I agree to the terms & conditions"
-      },
-      "events": {
-        "custom:setProperty": [
-          "$event.payload"
-        ]
-      },
-      "properties": {
-        "fd:dor": {
-          "dorExclusion": false
-        },
-        "fd:path": "/content/termsandconditionsNoWrapData/approvalcheckbox"
-      },
-      "enum": [
-        "true"
-      ],
-      ":type": "core/fd/components/form/checkbox/v1/checkbox"
-    },
-    "link": {
-      "id": "checkboxgroup-577c0892d3",
-      "fieldType": "checkbox-group",
-      "name": "link1694159323342",
-      "type": "string",
-      "enforceEnum": true,
-      "label": {
-        "value": ""
-      },
-      "events": {
-        "custom:setProperty": [
-          "$event.payload"
-        ]
-      },
-      "properties": {
-        "afs:layout": {
-          "orientation": "vertical"
-        },
-        "fd:dor": {
-          "dorExclusion": false
-        },
-        "fd:path": "/content/termsandconditionsNoWrapData/link"
-      },
-      "enum": [
-        "yourlink"
-      ],
-      ":type": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
-      "enumNames": [
-        {
-          "value": "label for the link"
-        }
-      ]
-    }
-  },
-  ":type": "core/fd/components/form/termsandconditions/v1/termsandconditions"
-}
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/test-content.json b/bundles/af-core/src/test/resources/form/termsandconditions/test-content.json
deleted file mode 100644
index b7ef1cf3c5..0000000000
--- a/bundles/af-core/src/test/resources/form/termsandconditions/test-content.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "termsandconditions": {
-    "showApprovalOption": true,
-    "jcr:title": "Terms And Conditions",
-    "fd:tnc": true,
-    "showAsPopup": true,
-    "name": "termsandconditions1694159302516",
-    "sling:resourceType": "core/fd/components/form/termsandconditions/v1/termsandconditions",
-    "wrapData": true,
-    "fieldType": "panel",
-    "text": {
-      "jcr:primaryType": "nt:unstructured",
-      "jcr:title": "",
-      "name": "consenttext",
-      "value": "Text related to the terms and conditions come here",
-      "hideTitle": "true",
-      "sling:resourceType": "core/fd/components/form/text/v1/text",
-      "fieldType": "plain-text"
-    },
-    "approvalcheckbox": {
-      "jcr:primaryType": "nt:unstructured",
-      "jcr:title": "I agree to the terms & conditions",
-      "enabled": "false",
-      "name": "approvalcheckbox",
-      "checkedValue": "true",
-      "sling:resourceType": "core/fd/components/form/checkbox/v1/checkbox",
-      "fieldType": "checkbox"
-    },
-    "link": {
-      "jcr:primaryType": "nt:unstructured",
-      "jcr:title": "",
-      "orientation": "vertical",
-      "enum": [
-        "yourlink"
-      ],
-      "name": "link1694159323342",
-      "title": "I agree to the terms & conditions",
-      "enumNames": [
-        "label for the link"
-      ],
-      "sling:resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
-      "fieldType": "checkbox-group"
-    }
-  },
-  "termsandconditionsNoWrapData": {
-    "showApprovalOption": true,
-    "jcr:title": "Terms And Conditions",
-    "fd:tnc": true,
-    "showAsPopup": true,
-    "showLink": true,
-    "name": "termsandconditions1694159302516",
-    "sling:resourceType": "core/fd/components/form/termsandconditions/v1/termsandconditions",
-    "wrapData": false,
-    "fieldType": "panel",
-    "text": {
-      "jcr:primaryType": "nt:unstructured",
-      "jcr:title": "",
-      "name": "consenttext",
-      "value": "Text related to the terms and conditions come here",
-      "hideTitle": "true",
-      "sling:resourceType": "core/fd/components/form/text/v1/text",
-      "fieldType": "plain-text"
-    },
-    "approvalcheckbox": {
-      "jcr:primaryType": "nt:unstructured",
-      "jcr:title": "I agree to the terms & conditions",
-      "enabled": "false",
-      "name": "approvalcheckbox",
-      "checkedValue": "true",
-      "sling:resourceType": "core/fd/components/form/checkbox/v1/checkbox",
-      "fieldType": "checkbox"
-    },
-    "link": {
-      "jcr:primaryType": "nt:unstructured",
-      "jcr:title": "",
-      "orientation": "vertical",
-      "enum": [
-        "yourlink"
-      ],
-      "name": "link1694159323342",
-      "title": "I agree to the terms & conditions",
-      "enumNames": [
-        "label for the link"
-      ],
-      "sling:resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
-      "fieldType": "checkbox-group"
-    }
-  }
-}
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/checkbox.less b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/checkbox.less
deleted file mode 100644
index e46730b395..0000000000
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/checkbox.less
+++ /dev/null
@@ -1,17 +0,0 @@
-.cmp-adaptiveform-checkbox {
-  .containerMixin();
-  .descriptionMixin();
-  .validInvalidMixin();
-  &__help-container {
-    flex-direction: row-reverse;
-    display: flex
-  }
-  &__widget-container {
-    flex-direction: row;
-    align-items: baseline;
-    display: flex
-  }
-  &__widget {
-    .itemWidgetMixin();
-  }
-}
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/common.less b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/common.less
index dea4b4ef21..8343a735e9 100644
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/common.less
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/common.less
@@ -170,16 +170,4 @@
     background: url(./resources/tick_hover.svg) 0.5rem 50% / 0.8125rem no-repeat,@very-light-gray;
     background-size: 12px;
   }
-}
-
-.termsAndConditionsText() {
-  color: @light-gray;
-  max-height: 160px;
-  border: 1px solid #ccc;
-  border-radius: .25rem;
-  margin-bottom: .25rem;
-  padding-left: 1rem;
-  padding-right: 1rem;
-  font-size: .875rem;
-  overflow: auto
-}
+}
\ No newline at end of file
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/termsandconditions.less b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/termsandconditions.less
deleted file mode 100644
index 553e85c019..0000000000
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/adaptive-form/termsandconditions.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.cmp-adaptiveform-termsandcondition {
-  .containerMixin();
-  &__label {
-    flex: 1;
-    font-size: 1.25rem
-  }
-  &__label-container {
-    justify-content: space-between;
-    align-items: center;
-    display: flex
-  }
-  &____content-container {
-    margin-top: 10px
-  }
-  &__text {
-    .termsAndConditionsText();
-  }
-}
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/index.less b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/index.less
index 8cce5935ee..16144c9e01 100644
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/index.less
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/clientlibs/forms-clientlib-site/styles/components/index.less
@@ -37,5 +37,3 @@
 @import 'adaptive-form/title.less';
 @import 'adaptive-form/wizard.less';
 @import 'adaptive-form/verticaltabs.less';
-@import 'adaptive-form/checkbox.less';
-@import 'adaptive-form/termsandconditions.less';
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/emailinput/_cq_template.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/emailinput/_cq_template.xml
index b9e9d87e14..f097d0d61d 100644
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/emailinput/_cq_template.xml
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/emailinput/_cq_template.xml
@@ -2,5 +2,4 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="nt:unstructured"
     jcr:title="Email Input"
-    pattern="^(([^&lt;&gt;()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^&lt;&gt;()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$"
     fieldType="email"/>
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/pageheader/_cq_template.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/pageheader/_cq_template.xml
index 9c604fe58f..71337b2882 100644
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/pageheader/_cq_template.xml
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/pageheader/_cq_template.xml
@@ -20,7 +20,9 @@
     fieldType="page-header">
     <image
         jcr:primaryType="nt:unstructured"
-        sling:resourceType="core/wcm/components/image/v3/image"/>
+        jcr:title="Logo"
+        sling:resourceType="wcm/foundation/components/image"
+        name="logoImage"/>
     <text
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/foundation/components/text"
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/switch/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/switch/.content.xml
deleted file mode 100644
index b1f52e213f..0000000000
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/switch/.content.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
-          xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          jcr:primaryType="cq:Component"
-          jcr:title="Adaptive Form Switch"
-          jcr:description="Add a switch for users to toggle between two options."
-          sling:resourceSuperType="core/fd/components/form/switch/v1/switch"
-          cq:icon="switch"
-          componentGroup="Core Components Examples - Adaptive Form"/>
\ No newline at end of file
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/switch/_cq_template.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/switch/_cq_template.xml
deleted file mode 100644
index 1291bb47f0..0000000000
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/switch/_cq_template.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
-          jcr:primaryType="nt:unstructured"
-          jcr:title="Switch"
-          fieldType="checkbox"
-          enum="[1,0]"
-          enumNames="[ON,OFF]"/>
\ No newline at end of file
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/.content.xml
deleted file mode 100644
index 9390fcd533..0000000000
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/.content.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:description="Terms And Conditions."
-    jcr:primaryType="cq:Component"
-    jcr:title="Adaptive Form Terms And Conditions"
-    sling:resourceSuperType="core/fd/components/form/termsandconditions/v1/termsandconditions"
-    componentGroup="Core Components Examples - Adaptive Form"/>
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/_cq_template/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/_cq_template/.content.xml
deleted file mode 100644
index 95a10387e4..0000000000
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/_cq_template/.content.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
-  jcr:primaryType="nt:unstructured"
-  jcr:title="Terms And Conditions"
-  fieldType="panel"
-  fd:tnc="{Boolean}true"
-  wrapData="{Boolean}true">
-  <text
-    name="consenttext"
-    jcr:primaryType="nt:unstructured"
-    jcr:title="\0"
-    sling:resourceType="core/fd/components/form/text/v1/text"
-    fieldType="plain-text"
-    hideTitle="true"
-    value="Text related to the terms and conditions come here"/>
-  <approvalcheckbox
-    name="approvalcheckbox"
-    jcr:primaryType="nt:unstructured"
-    jcr:title="I agree to the terms &amp; conditions"
-    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
-    enabled="false"
-    checkedValue="true"
-    fieldType="checkbox">
-  </approvalcheckbox>
-  <link
-    jcr:primaryType="nt:unstructured"
-    jcr:title="\0"
-    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
-    orientation="vertical"
-    type="string[]"
-    enum="your-link-here"
-    enumNames="[label for the link]"
-    fieldType="checkbox-group"
-    title="I agree to the terms &amp; conditions">
-    <fd:rules
-      jcr:primaryType="nt:unstructured"
-      validationStatus="valid"/>
-    <fd:events
-      jcr:primaryType="nt:unstructured"
-      change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
-  </link>
-</jcr:root>
diff --git a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/policies/.content.xml b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/policies/.content.xml
index c16f4c344c..8af95469c2 100644
--- a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/policies/.content.xml
+++ b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/policies/.content.xml
@@ -206,35 +206,6 @@
                                 jcr:primaryType="nt:unstructured"/>
                     </default>
                 </panelcontainer>
-                <switch jcr:primaryType="nt:unstructured">
-                    <default
-                            jcr:lastModified="{Date}2023-10-05T12:36:42.398+05:30"
-                            jcr:lastModifiedBy="admin"
-                            jcr:primaryType="nt:unstructured"
-                            jcr:title="Switch-label-visibility-policy"
-                            cq:styleDefaultClasses="cmp-adaptiveform-switch__hide-labels"
-                            sling:resourceType="wcm/core/components/policy/policy">
-                        <jcr:content jcr:primaryType="nt:unstructured"/>
-                        <cq:styleGroups jcr:primaryType="nt:unstructured">
-                            <item0
-                                    cq:styleGroupLabel="Hide labels"
-                                    jcr:primaryType="nt:unstructured">
-                                <cq:styles jcr:primaryType="nt:unstructured">
-                                    <item0
-                                            cq:styleClasses="cmp-adaptiveform-switch__hide-labels"
-                                            cq:styleId="1696489484081"
-                                            cq:styleLabel="Hide Labels"
-                                            jcr:primaryType="nt:unstructured"/>
-                                    <item1
-                                            cq:styleClasses="cmp-adaptiveform-switch__unhide-labels"
-                                            cq:styleId="1696489594671"
-                                            cq:styleLabel="Unhide Labels"
-                                            jcr:primaryType="nt:unstructured"/>
-                                </cq:styles>
-                            </item0>
-                        </cq:styleGroups>
-                    </default>
-                </switch>
             </form>
             <page jcr:primaryType="nt:unstructured">
                 <default
diff --git a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-blank-v2/policies/.content.xml b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-blank-v2/policies/.content.xml
index 7276c51cc4..faba62230a 100755
--- a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-blank-v2/policies/.content.xml
+++ b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-blank-v2/policies/.content.xml
@@ -43,11 +43,6 @@
                                 jcr:primaryType="nt:unstructured"
                                 sling:resourceType="wcm/core/components/policies/mapping">
                         </panelcontainer>
-                        <switch
-                                cq:policy="forms-components-examples/components/form/switch/default"
-                                jcr:primaryType="nt:unstructured"
-                                sling:resourceType="wcm/core/components/policies/mapping">
-                        </switch>
                     </form>
                 </components>
             </forms-components-examples>
diff --git a/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/.content.xml b/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/.content.xml
index 65ace20958..d7c73deb0c 100644
--- a/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/.content.xml
+++ b/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/.content.xml
@@ -30,7 +30,6 @@
     <radiobutton/>
     <resetbutton/>
     <submitbutton/>
-    <switch/>
     <tabsontop/>
     <telephoneinput/>
     <text/>
diff --git a/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/switch/.content.xml b/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/switch/.content.xml
deleted file mode 100644
index 48385b4ff9..0000000000
--- a/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/switch/.content.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-          jcr:primaryType="cq:Page">
-    <jcr:content
-            cq:lastModified="{Date}2020-07-15T13:25:39.732+02:00"
-            cq:lastModifiedBy="admin"
-            cq:tags="[]"
-            cq:template="/conf/core-components-examples/settings/wcm/templates/content-page"
-            jcr:description="Switch"
-            jcr:primaryType="cq:PageContent"
-            jcr:title="Switch"
-            sling:resourceType="forms-components-examples/components/page">
-        <root
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="wcm/foundation/components/responsivegrid">
-            <responsivegrid
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/responsivegrid">
-                <text_1740702241
-                        cq:styleIds="[1644862132301]"
-                        jcr:created="{Date}2019-02-15T19:05:53.032+01:00"
-                        jcr:createdBy="admin"
-                        jcr:lastModified="{Date}2019-02-15T19:09:39.787+01:00"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="core/wcm/components/text/v2/text"
-                        text="&lt;h1>Switch&lt;sub>v1&lt;/sub>&lt;/h1>"
-                        textIsRich="true"/>
-                <text
-                        cq:styleIds="[1544762734201]"
-                        jcr:created="{Date}2018-12-06T19:11:23.947+01:00"
-                        jcr:createdBy="admin"
-                        jcr:lastModified="{Date}2020-07-15T13:25:39.729+02:00"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="core/wcm/components/text/v2/text"
-                        text="&lt;p>A switch in an Adaptive Form allows users to select one of two options. Each switch is represented by a Data Value (value to be sent to backend) and display value&lt;/p>"
-                        textIsRich="true"/>
-                <teaser
-                        cq:styleIds="[1550165685463]"
-                        jcr:created="{Date}2019-02-14T16:41:54.952+01:00"
-                        jcr:createdBy="admin"
-                        jcr:description="&lt;p>GitHub&lt;/p>&#xd;&#xa;"
-                        jcr:lastModified="{Date}2019-02-14T16:49:57.290+01:00"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Technical Documentation"
-                        sling:resourceType="core-components-examples/components/teaser"
-                        actionsEnabled="false"
-                        descriptionFromPage="false"
-                        fileReference="/content/dam/core-components-examples/library/github-logo.svg"
-                        linkURL="https://github.com/adobe/aem-core-forms-components/tree/master/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch"
-                        textIsRich="true"
-                        titleFromPage="false"/>
-                <title_865328580
-                        cq:styleIds="[1544759664489]"
-                        jcr:created="{Date}2018-12-06T19:22:23.729+01:00"
-                        jcr:createdBy="admin"
-                        jcr:lastModified="{Date}2018-12-06T19:23:25.116+01:00"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Examples"
-                        sling:resourceType="core/wcm/components/title/v2/title"
-                        type="h2"/>
-                <title_290384408
-                        cq:styleIds="[1544759676459]"
-                        jcr:created="{Date}2018-12-06T19:22:48.620+01:00"
-                        jcr:createdBy="admin"
-                        jcr:lastModified="{Date}2019-05-22T11:01:40.926+03:00"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Standard"
-                        sling:resourceType="core/wcm/components/title/v2/title"
-                        type="h3"/>
-                <text_1337506761
-                        jcr:created="{Date}2018-12-06T19:23:41.968+01:00"
-                        jcr:createdBy="admin"
-                        jcr:lastModified="{Date}2019-05-22T11:26:32.604+03:00"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="core/wcm/components/text/v2/text"
-                        text="&lt;p>A simple switch.&lt;/p>"
-                        textIsRich="true"/>
-                <demo
-                        jcr:created="{Date}2018-12-07T12:55:03.496+01:00"
-                        jcr:createdBy="admin"
-                        jcr:lastModified="{Date}2018-12-07T12:55:03.496+01:00"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="forms-components-examples/components/demo">
-                    <component
-                            jcr:primaryType="nt:unstructured"
-                            sling:resourceType="forms-components-examples/components/demo/component">
-                        <guideContainer
-                          fd:version="2.1"
-                          fieldType="form"
-                          jcr:primaryType="nt:unstructured"
-                          sling:resourceType="forms-components-examples/components/form/container">
-                            <container
-                              jcr:primaryType="nt:unstructured"
-                              sling:resourceType="forms-components-examples/components/demo/component">
-                                <switch_demo
-                                  jcr:title="Switch"
-                                  fieldType="checkbox"
-                                  type="string"
-                                  jcr:created="{Date}2019-03-06T14:11:01.819+01:00"
-                                  jcr:createdBy="admin"
-                                  jcr:lastModified="{Date}2019-05-21T18:59:35.605+03:00"
-                                  jcr:lastModifiedBy="admin"
-                                  jcr:primaryType="nt:unstructured"
-                                  description="&lt;p>This is a long description.&lt;/p>"
-                                  tooltip="&lt;p>This is a short description.&lt;/p>"
-                                  tooltipVisible="true"
-                                  sling:resourceType="forms-components-examples/components/form/switch"/>
-                            </container>
-                        </guideContainer>
-                    </component>
-                    <info
-                            jcr:primaryType="nt:unstructured"
-                            sling:resourceType="core-components-examples/components/tabs">
-                        <properties
-                                cq:panelTitle="Properties"
-                                jcr:primaryType="nt:unstructured"
-                                sling:resourceType="core-components-examples/components/demo/properties"
-                                reference="../../component/guideContainer/container"/>
-                        <markup
-                                cq:panelTitle="Markup"
-                                jcr:primaryType="nt:unstructured"
-                                sling:resourceType="core-components-examples/components/demo/markup"
-                                reference="../../component/guideContainer/container"/>
-                        <json
-                                cq:panelTitle="JSON"
-                                jcr:primaryType="nt:unstructured"
-                                sling:resourceType="core-components-examples/components/demo/json"
-                                reference="../../component/guideContainer/container"/>
-                    </info>
-                </demo>
-            </responsivegrid>
-        </root>
-    </jcr:content>
-</jcr:root>
diff --git a/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/termsandconditions/.content.xml b/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/termsandconditions/.content.xml
deleted file mode 100644
index 824a08cbbb..0000000000
--- a/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/termsandconditions/.content.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
-    jcr:primaryType="cq:Page">
-    <jcr:content
-        cq:lastModified="{Date}2022-09-01T13:25:39.732+02:00"
-        cq:lastModifiedBy="admin"
-        cq:tags="[]"
-        cq:template="/conf/core-components-examples/settings/wcm/templates/content-page"
-        jcr:description="Terms and Conditions"
-        jcr:primaryType="cq:PageContent"
-        jcr:title="Terms and Conditions"
-        sling:resourceType="forms-components-examples/components/page">
-        <root
-            jcr:primaryType="nt:unstructured"
-            sling:resourceType="wcm/foundation/components/responsivegrid">
-            <responsivegrid
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="wcm/foundation/components/responsivegrid">
-                <text_1740702241
-                    cq:styleIds="[1644862132301]"
-                    jcr:lastModified="{Date}2019-02-15T19:09:39.787+01:00"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="core/wcm/components/text/v2/text"
-                    text="&lt;h1>Terms and Conditions&lt;sub>v1&lt;/sub>&lt;/h1>"
-                    textIsRich="true"/>
-                <text
-                    cq:styleIds="[1544762734201]"
-                    jcr:lastModified="{Date}2020-07-15T13:25:39.729+02:00"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="core/wcm/components/text/v2/text"
-                    text="&lt;p>Terms and Conditions.&lt;/p>"
-                    textIsRich="true"/>
-                <teaser
-                    cq:styleIds="[1550165685463]"
-                    jcr:description="&lt;p>GitHub&lt;/p>&#xd;&#xa;"
-                    jcr:lastModified="{Date}2019-02-14T16:49:57.290+01:00"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Technical Documentation"
-                    sling:resourceType="core-components-examples/components/teaser"
-                    actionsEnabled="false"
-                    descriptionFromPage="false"
-                    fileReference="/content/dam/core-components-examples/library/github-logo.svg"
-                    linkURL="https://github.com/adobe/aem-core-forms-components/tree/master/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions"
-                    textIsRich="true"
-                    titleFromPage="false"/>
-                <title_865328580
-                    cq:styleIds="[1544759664489]"
-                    jcr:lastModified="{Date}2018-12-06T19:23:25.116+01:00"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Examples"
-                    sling:resourceType="core/wcm/components/title/v2/title"
-                    type="h2"/>
-                <title_290384408
-                    cq:styleIds="[1544759676459]"
-                    jcr:lastModified="{Date}2019-05-22T11:01:40.926+03:00"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Standard"
-                    sling:resourceType="core/wcm/components/title/v2/title"
-                    type="h3"/>
-                <text_1337506761
-                    jcr:lastModified="{Date}2019-05-22T11:26:32.604+03:00"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="core/wcm/components/text/v2/text"
-                    text="&lt;p>Terms And Conditions Demo.&lt;/p>"
-                    textIsRich="true"/>
-                <demo
-                    jcr:lastModified="{Date}2018-12-07T12:55:03.496+01:00"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="forms-components-examples/components/demo">
-                    <component
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="forms-components-examples/components/demo/component">
-                        <guideContainer
-                            fd:version="2.1"
-                            jcr:primaryType="nt:unstructured"
-                            sling:resourceType="forms-components-examples/components/form/container"
-                            fieldType="form">
-                            <container
-                                jcr:primaryType="nt:unstructured"
-                                sling:resourceType="forms-components-examples/components/demo/component">
-                                <termsandconditions
-                                    fd:tnc="{Boolean}true"
-                                    jcr:created="{Date}2023-09-11T12:57:19.055+05:30"
-                                    jcr:createdBy="admin"
-                                    jcr:lastModified="{Date}2023-09-11T12:57:19.055+05:30"
-                                    jcr:lastModifiedBy="admin"
-                                    jcr:primaryType="nt:unstructured"
-                                    jcr:title="Terms And Conditions"
-                                    sling:resourceType="forms-components-examples/components/form/termsandconditions"
-                                    fieldType="panel"
-                                    name="termsandconditions1694417240084"
-                                    wrapData="{Boolean}true">
-                                    <text
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="\0"
-                                        sling:resourceType="core/fd/components/form/text/v1/text"
-                                        fieldType="plain-text"
-                                        hideTitle="true"
-                                        name="consenttext"
-                                        value="Text related to the terms and conditions come here"/>
-                                    <approvalcheckbox
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="I agree to the terms &amp; conditions"
-                                        sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
-                                        checkedValue="true"
-                                        enabled="false"
-                                        fieldType="checkbox"
-                                        name="approvalcheckbox">
-                                        <fd:events
-                                            jcr:primaryType="nt:unstructured"
-                                            custom_scrollDone="\{enabled: true()}"
-                                            custom_scrollInitialized="\{enabled: false()}"/>
-                                    </approvalcheckbox>
-                                    <link
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="\0"
-                                        sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
-                                        enum="['yourlink']"
-                                        enumNames="[label for the link]"
-                                        fieldType="checkbox-group"
-                                        name="link1694418075696"
-                                        orientation="vertical"
-                                        title="I agree to the terms &amp; conditions">
-                                        <fd:rules
-                                            jcr:primaryType="nt:unstructured"
-                                            validationStatus="valid"/>
-                                        <fd:events
-                                            jcr:primaryType="nt:unstructured"
-                                            change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
-                                    </link>
-                                </termsandconditions>
-                            </container>
-                        </guideContainer>
-                    </component>
-                    <info
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="core-components-examples/components/tabs">
-                        <properties
-                            cq:panelTitle="Properties"
-                            jcr:primaryType="nt:unstructured"
-                            sling:resourceType="core-components-examples/components/demo/properties"
-                            reference="../../component/guideContainer/container"/>
-                        <markup
-                            cq:panelTitle="Markup"
-                            jcr:primaryType="nt:unstructured"
-                            sling:resourceType="core-components-examples/components/demo/markup"
-                            reference="../../component/guideContainer/container"/>
-                        <json
-                            cq:panelTitle="JSON"
-                            jcr:primaryType="nt:unstructured"
-                            sling:resourceType="core-components-examples/components/demo/json"
-                            reference="../../component/guideContainer/container"/>
-                    </info>
-                </demo>
-            </responsivegrid>
-        </root>
-    </jcr:content>
-</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml
index 0184cfce56..04ee0e1ebd 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml
@@ -129,21 +129,6 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="Zauberer"/>
-    <_x0039_6b6493f-b93e-4b2d-8b38-3633a3fe6286
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Tier auswählen&lt;/b>&lt;/p>"/>
-    <fba2a273-8ffd-4286-87c8-120bab383d9e
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Hund&lt;/i>&lt;/p>"/>
-    <_x0037_c44f84b-8830-4270-ba63-8aa9de935572
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Katze&lt;/u>&lt;/p>"/>
     <bb998be9-c330-493c-a5d3-e252a9ab8cc7
         jcr:mixinTypes="[sling:Message]"
         jcr:primaryType="nt:folder"
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/es.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/es.xml
index 3f3e47fd7c..40699222b0 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/es.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/es.xml
@@ -129,21 +129,6 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="Hechicero"/>
-    <a6492758-b569-4c76-aaa1-29bf4b30cdfd
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Seleccionar animal&lt;/b>&lt;/p>"/>
-    <f51e320e-140a-4850-a65f-296944b9fabe
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Perro&lt;/i>&lt;/p>"/>
-    <_x0031_33de41e-050d-4628-8b22-34b8b6dfa9fa
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Gato&lt;/u>&lt;/p>"/>
     <bb998be9-c330-493c-a5d3-e252a9ab8cc7
         jcr:mixinTypes="[sling:Message]"
         jcr:primaryType="nt:folder"
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/fr.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/fr.xml
index 8e78a152f9..ec11165358 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/fr.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/fr.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="Sorcier"/>
-    <bf783b29-c90f-440c-a14b-11684a87ca79
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Sélectionner un animal&lt;/b>&lt;/p>"/>
-    <_x0037_e28c9de-7712-4f7b-969d-0c90f92935af
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Chien&lt;/i>&lt;/p>"/>
-    <_x0032_869e60b-f2eb-4e35-8d17-0673f7d870bc
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Chat&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml
index 9ab5e0f0b2..81f80c0637 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="जादूगर"/>
-    <_x0035_3786ca1-ac18-4151-8e13-db1ec440cb44
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>पशु का चयन करें&lt;/b>&lt;/p>"/>
-    <a420bd56-ad98-43df-9477-75e455bc0103
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>कुत्ता&lt;/i>&lt;/p>"/>
-    <f733b6f8-a8d1-4025-9f6c-7cbde7accc0e
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>बिल्ली&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml
index 06a9c39887..88d4a55147 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="mago"/>
-    <_x0038_fa19b1d-324d-453f-895f-60c86adb001c
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Seleziona animale&lt;/b>&lt;/p>"/>
-    <_x0030_ac73bc4-9c29-470f-9a99-a1c7f685a5b9
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Cane&lt;/i>&lt;/p>"/>
-    <_x0038_23d3ccb-d875-4a8d-9ff9-2a2859d7bdbd
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Gatto&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml
index 10e9a6fce7..5ade060385 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="魔法使い"/>
-    <_x0030_9640d23-a956-457d-82fa-671bf0750fce
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>動物を選択&lt;/b>&lt;/p>"/>
-    <cf37cd4a-00e4-4e91-886a-7c428b34c28f
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>犬&lt;/i>&lt;/p>"/>
-    <_x0038_a1f5c5f-4a24-4c48-a433-ce761870bbb1
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>猫&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml
index c68ecb7698..4650cd9bff 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="마법사"/>
-    <_x0030_d52109d-2260-4962-b0a4-a589fceb42cd
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>동물 선택&lt;/b>&lt;/p>"/>
-    <_x0030_ab74673-ed86-4d13-853e-86fbcb638588
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>개&lt;/i>&lt;/p>"/>
-    <b74e28f6-aa6a-4823-b87b-c45b0058d67d
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>고양이&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml
index 6f41b8ee49..59242cfbb7 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="mago"/>
-    <f680e4d1-ff1f-48f6-872d-cebd53fec33e
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Selecione Animal&lt;/b>&lt;/p>"/>
-    <_x0031_b25629c-4816-4847-a9d1-63e421b47930
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Cão&lt;/i>&lt;/p>"/>
-    <f0f38a3c-c391-4924-ba80-98bf8ec5e749
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Gato&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml
index 67653db508..855f673d2b 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="колдун"/>
-    <cdf88ca7-c079-4f65-878d-0228f951d247
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>Выберите животное&lt;/b>&lt;/p>"/>
-    <cfcca183-f863-4d22-bc1f-2feffccda805
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>Собака&lt;/i>&lt;/p>"/>
-    <_x0038_d8b15a1-c3c9-4816-abd6-7e69bc3c477a
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>Кошка&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml
index edd3fd1865..ff03638494 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="巫师"/>
-    <_x0034_6fd8a2d-db44-4204-aca8-a4e8ecb178f7
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>选择动物&lt;/b>&lt;/p>"/>
-    <d2603a98-dd4b-4adf-a2b2-df99a7d8c00b
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>狗&lt;/i>&lt;/p>"/>
-    <_x0037_79cf790-b54b-429e-b5b2-ebed6ea0cbb7
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>猫&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml
index d317556721..fd7a76f7e6 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml
@@ -129,19 +129,4 @@
         jcr:primaryType="nt:folder"
         sling:key="guideContainer##wizard##jcr:title##299"
         sling:message="巫師"/>
-    <_x0036_0c96847-776f-406a-9de3-a669f70ca113
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##jcr:title##3329"
-        sling:message="&lt;p>&lt;b>選擇動物&lt;/b>&lt;/p>"/>
-    <_x0037_75e6e65-0828-4020-95f6-355249b69aaf
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##0"
-        sling:message="&lt;p>&lt;i>狗&lt;/i>&lt;/p>"/>
-    <_x0030_a911e93-4cd9-416d-ac7a-1f348014bbed
-        jcr:mixinTypes="[sling:Message]"
-        jcr:primaryType="nt:folder"
-        sling:key="guideContainer##checkboxgroup7##enumNames##7570##1"
-        sling:message="&lt;p>&lt;u>貓&lt;/u>&lt;/p>"/>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/setfocus/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/setfocus/.content.xml
deleted file mode 100644
index b35abde581..0000000000
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/setfocus/.content.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
-    jcr:primaryType="dam:Asset">
-    <jcr:content
-        cq:conf="\0"
-        jcr:lastModified="{Date}2023-10-11T16:50:18.425+05:30"
-        jcr:primaryType="dam:AssetContent"
-        sling:resourceType="fd/fm/af/render"
-        guide="1"
-        type="guide">
-        <metadata
-            fd:version="2.1"
-            jcr:language="en"
-            jcr:primaryType="nt:unstructured"
-            xmp:CreatorTool="AEM Forms AF Wizard"
-            allowedRenderFormat="HTML"
-            author="admin"
-            dorType="none"
-            formmodel="none"
-            themeRef="/libs/fd/af/themes/canvas"
-            title="setFocus"/>
-    </jcr:content>
-</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/.content.xml
deleted file mode 100755
index 7256712059..0000000000
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/.content.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
-    jcr:mixinTypes="[rep:AccessControllable]"
-    jcr:primaryType="sling:Folder"
-    lcFolder="{Long}0"
-    type="lcFolder"
-/>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/basic/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/basic/.content.xml
deleted file mode 100755
index 109206d96b..0000000000
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/basic/.content.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
-    <jcr:content
-        jcr:lastModified="{Date}2021-12-02T15:12:59.947+05:30"
-        jcr:primaryType="dam:AssetContent"
-        sling:resourceType="fd/fm/af/render"
-        guide="1"
-        type="guide">
-        <metadata
-            fd:version="2.1"
-            jcr:primaryType="nt:unstructured"
-            allowedRenderFormat="HTML"
-            author="admin"
-            availableInMobileApp="{Boolean}false"
-            dorType="none"
-            formmodel="none"
-            hasCustomThumbnail="{Boolean}false"
-            title="Adaptive Form V2 (IT)"/>
-    </jcr:content>
-</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/accessibility/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/accessibility/.content.xml
index d967a6f18e..a08ef85bd0 100644
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/accessibility/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/accessibility/.content.xml
@@ -2692,26 +2692,6 @@
                         name="text1685010111735"
                         textIsRich="true"
                         value="&lt;p>&lt;strong style=&quot;font-size: 1rem;&quot;>I understand that&lt;/strong>:&lt;br>&#xa;&lt;/p>&#xa;&lt;ul>&#xa;&lt;li>Child Support can make relevant enquiries to make sure I receive the correct entitlement.&lt;/li>&#xa;&lt;li>giving false or misleading information is a serious offence.&lt;/li>&#xa;&lt;/ul>"/>
-                    <switch
-                            jcr:lastModified="{Date}2023-06-23T16:58:54.738+05:30"
-                            jcr:lastModifiedBy="admin"
-                            jcr:primaryType="nt:unstructured"
-                            jcr:title="I am attaching supported documents"
-                            sling:resourceType="core/fd/components/form/switch/v1/switch"
-                            description="&lt;p>This is long description&lt;/p>&#xd;&#xa;"
-                            enabled="{Boolean}true"
-                            enum="[0,1]"
-                            enumNames="[No,Yes]"
-                            fieldType="checkbox"
-                            hideTitle="false"
-                            mandatoryMessage="this is a required field"
-                            name="switch1662722663424"
-                            readOnly="{Boolean}false"
-                            tooltip="&lt;p>This is short description&lt;/p>&#xd;&#xa;"
-                            tooltipVisible="true"
-                            type="string"
-                            unboundFormElement="{Boolean}false"
-                            visible="{Boolean}true"/>
                     <checkboxgroup
                         jcr:lastModified="{Date}2023-05-30T08:08:18.288Z"
                         jcr:lastModifiedBy="admin"
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
index 228fda67fc..e47fefc6db 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
@@ -48,7 +48,7 @@
                 enum="[0,1]"
                 enumNames="[Item 1, Item 2]"
                 fieldType="checkbox-group"
-                name="checkboxgroup1"
+                name="checkboxgroup1678442866069"
                 type="number[]"/>
             <datepicker
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##datepicker##jcr:title##9506&quot;}"
@@ -215,29 +215,6 @@
                 sling:resourceType="forms-components-examples/components/form/wizard"
                 fieldType="panel"
                 name="wizard1678442986146"/>
-            <checkboxgroup7
-                    fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##checkboxgroup7##jcr:title##3329&quot;,&quot;enumNames&quot;:&quot;guideContainer##checkboxgroup7##enumNames##7570&quot;}"
-                    jcr:created="{Date}2023-10-06T11:32:51.920+05:30"
-                    jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-06T11:33:40.225+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
-                    areOptionsRichText="true"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[&lt;p>&lt;i>Dog&lt;/i>&lt;/p>,&lt;p> &lt;u>Cat&lt;/u>&lt;/p>]"
-                    fieldType="checkbox-group"
-                    hideTitle="false"
-                    isTitleRichText="true"
-                    name="checkboxgroup2"
-                    orientation="horizontal"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true,true,true,true]"
-                    type="number[]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true"/>
         </guideContainer>
     </jcr:content>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml
index 9dc2b02920..30e1d78040 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml
@@ -153,28 +153,6 @@
                     textIsRich="[true,true]"
                     type="number[]"
                     visible="{Boolean}true"/>
-            <checkboxgroup7
-                    jcr:created="{Date}2023-10-06T11:32:51.920+05:30"
-                    jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-06T11:33:40.225+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
-                    areOptionsRichText="true"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[&lt;p>&lt;i>Dog&lt;/i>&lt;/p>,&lt;p> &lt;u>Cat&lt;/u>&lt;/p>]"
-                    fieldType="checkbox-group"
-                    hideTitle="false"
-                    isTitleRichText="true"
-                    name="checkboxgroup_19427271491696572172217"
-                    orientation="horizontal"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true,true,true,true]"
-                    type="number[]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true"/>
         </guideContainer>
     </jcr:content>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/emailinput/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/emailinput/basic/.content.xml
index a18c2ced25..8eab359537 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/emailinput/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/emailinput/basic/.content.xml
@@ -20,7 +20,7 @@
                 jcr:primaryType="nt:unstructured"
                 name="emailinput1"
                 jcr:title="Email Input 1"
-                pattern="^(([^&lt;&gt;()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^&lt;&gt;()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$"
+                pattern="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,}$"
                 validatePictureClauseMessage="validation picture clause error message!"
                 sling:resourceType="forms-components-examples/components/form/emailinput"/>
             <emailinput2
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/setfocus/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/setfocus/.content.xml
deleted file mode 100644
index 28a016478b..0000000000
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/setfocus/.content.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
-    jcr:primaryType="cq:Page">
-    <jcr:content
-        cq:deviceGroups="[/etc/mobile/groups/responsive]"
-        cq:lastModified="{Date}2023-10-11T16:50:18.416+05:30"
-        cq:lastModifiedBy="admin"
-        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
-        jcr:language="en"
-        jcr:primaryType="cq:PageContent"
-        jcr:title="setFocus"
-        sling:configRef="/conf/forms/core-components-it/samples/setfocus/"
-        sling:resourceType="forms-components-examples/components/page">
-        <guideContainer
-            fd:version="2.1"
-            jcr:primaryType="nt:unstructured"
-            sling:resourceType="forms-components-examples/components/form/container"
-            dorType="none"
-            fieldType="form"
-            thankYouOption="page"
-            themeRef="/libs/fd/af/themes/canvas"
-            title="setFocus">
-            <button
-                jcr:created="{Date}2023-10-11T15:27:29.898+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-11T15:27:29.898+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Button"
-                sling:resourceType="forms-components-examples/components/form/button"
-                dorExclusion="true"
-                fieldType="button"
-                name="button1697018250349">
-                <fd:rules
-                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button1697018250349&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button1697018250349&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_FOCUS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.tabsontop_5365387961697018194830.panelcontainer_19545345661697018234365.textinput1697022761060&quot;\,&quot;displayName&quot;:&quot;Text Input&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Tabs on top/Panel/Text Input/&quot;\,&quot;name&quot;:&quot;textinput1697022761060&quot;\,&quot;parent&quot;:&quot;$form.tabsontop_5365387961697018194830.panelcontainer_19545345661697018234365&quot;}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;setFocus($form.tabsontop_5365387961697018194830.panelcontainer_19545345661697018234365.textinput1697022761060)&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
-                    jcr:primaryType="nt:unstructured"
-                    validationStatus="valid"/>
-                <fd:events
-                    jcr:primaryType="nt:unstructured"
-                    click="[setFocus($form.tabsontop_5365387961697018194830.panelcontainer_19545345661697018234365.textinput1697022761060)]"/>
-            </button>
-            <accordion
-                jcr:created="{Date}2023-10-11T15:23:47.809+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-11T15:23:47.809+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Accordion"
-                sling:resourceType="forms-components-examples/components/form/accordion"
-                fieldType="panel"
-                name="accordion1697018028272">
-                <item_1
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Item 1"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    layout="responsiveGrid"
-                    name="item_1"/>
-                <item_2
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Item 2"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    layout="responsiveGrid"
-                    name="item_2"/>
-            </accordion>
-            <wizard
-                jcr:created="{Date}2023-10-11T15:23:53.698+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-11T15:23:53.698+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="wizard"
-                sling:resourceType="forms-components-examples/components/form/wizard"
-                fieldType="panel"
-                name="wizard1697018034254"/>
-            <verticaltabs
-                jcr:created="{Date}2023-10-11T15:24:08.171+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-11T15:24:08.171+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Vertical Tabs"
-                sling:resourceType="forms-components-examples/components/form/verticaltabs"
-                fieldType="panel"
-                name="verticaltabs1697018048763">
-                <emailinput
-                    jcr:created="{Date}2023-10-11T15:24:21.458+05:30"
-                    jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-11T15:24:21.458+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Email Input"
-                    sling:resourceType="forms-components-examples/components/form/emailinput"
-                    fieldType="email"
-                    name="emailinput1697018061785"/>
-            </verticaltabs>
-            <accordion_1040009888
-                jcr:created="{Date}2023-10-11T15:26:00.296+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-11T15:26:00.296+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Accordion"
-                sling:resourceType="forms-components-examples/components/form/accordion"
-                fieldType="panel"
-                name="accordion_10400098881697018160494">
-                <item_1
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Item 1"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    layout="responsiveGrid"
-                    name="item_1"/>
-                <item_2
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Item 2"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    layout="responsiveGrid"
-                    name="item_2"/>
-            </accordion_1040009888>
-            <tabsontop
-                jcr:created="{Date}2023-10-11T15:26:08.612+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-11T15:26:08.612+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Tabs on top"
-                sling:resourceType="forms-components-examples/components/form/tabsontop"
-                fieldType="panel"
-                name="tabsontop1697018168979"/>
-            <accordion_1681786975
-                jcr:created="{Date}2023-10-11T15:26:24.836+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-11T15:26:24.836+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Accordion"
-                sling:resourceType="forms-components-examples/components/form/accordion"
-                fieldType="panel"
-                name="accordion_16817869751697018185179">
-                <item_1
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Item 1"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    layout="responsiveGrid"
-                    name="item_1"/>
-                <item_2
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Item 2"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    layout="responsiveGrid"
-                    name="item_2"/>
-            </accordion_1681786975>
-            <tabsontop_536538796
-                jcr:created="{Date}2023-10-11T15:26:34.681+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-11T15:26:34.681+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Tabs on top"
-                sling:resourceType="forms-components-examples/components/form/tabsontop"
-                fieldType="panel"
-                name="tabsontop_5365387961697018194830">
-                <panelcontainer
-                    jcr:created="{Date}2023-10-11T15:27:04.292+05:30"
-                    jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-11T15:27:04.292+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Panel"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    name="panelcontainer1697018224463"/>
-                <panelcontainer_1954534566
-                    jcr:created="{Date}2023-10-11T15:27:14.189+05:30"
-                    jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-11T15:27:14.189+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Panel"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    name="panelcontainer_19545345661697018234365">
-                    <textinput
-                        jcr:created="{Date}2023-10-11T16:42:40.933+05:30"
-                        jcr:createdBy="admin"
-                        jcr:lastModified="{Date}2023-10-11T16:42:40.933+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Text Input"
-                        sling:resourceType="forms-components-examples/components/form/textinput"
-                        fieldType="text-input"
-                        name="textinput1697022761060"/>
-                </panelcontainer_1954534566>
-                <panelcontainer_756027751
-                    jcr:created="{Date}2023-10-11T15:27:21.228+05:30"
-                    jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-11T15:27:21.228+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Panel"
-                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
-                    fieldType="panel"
-                    name="panelcontainer_7560277511697018241386">
-                    <text
-                        jcr:created="{Date}2023-10-11T16:41:19.618+05:30"
-                        jcr:createdBy="admin"
-                        jcr:lastModified="{Date}2023-10-11T16:42:15.081+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="core-components-examples/components/text"
-                        text="ghjkjgdbfvsc"/>
-                </panelcontainer_756027751>
-            </tabsontop_536538796>
-        </guideContainer>
-    </jcr:content>
-</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/switch/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/switch/.content.xml
deleted file mode 100755
index 8f415a05ec..0000000000
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/switch/.content.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-          jcr:mixinTypes="[rep:AccessControllable]"
-          jcr:primaryType="sling:Folder"
-          hidden="true"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/switch/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/switch/basic/.content.xml
deleted file mode 100644
index 9e837ffa87..0000000000
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/switch/basic/.content.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
-          jcr:primaryType="cq:Page">
-    <jcr:content
-            cq:deviceGroups="[mobile/groups/responsive]"
-            cq:lastModified="{Date}2023-06-26T11:25:22.331+05:30"
-            cq:lastModifiedBy="admin"
-            cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
-            jcr:language="en"
-            jcr:primaryType="cq:PageContent"
-            jcr:title="Adaptive Form V2 (IT)"
-            sling:resourceType="forms-components-examples/components/page">
-        <guideContainer
-                fd:version="2.1"
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="forms-components-examples/components/form/container"
-                fieldType="form">
-            <switch1
-                    jcr:lastModified="{Date}2023-06-23T16:58:54.738+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Switch 1"
-                    sling:resourceType="core/fd/components/form/switch/v1/switch"
-                    description="&lt;p>This is long description&lt;/p>&#xd;&#xa;"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[OFF,ON]"
-                    fieldType="checkbox"
-                    hideTitle="false"
-                    mandatoryMessage="this is a required field"
-                    name="switch1662722663424"
-                    readOnly="{Boolean}false"
-                    tooltip="&lt;p>This is short description&lt;/p>&#xd;&#xa;"
-                    tooltipVisible="true"
-                    type="string"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true"/>
-            <switch2
-                    jcr:lastModified="{Date}2023-01-23T12:23:13.884+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Switch 2"
-                    sling:resourceType="core/fd/components/form/switch/v1/switch"
-                    default="0"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[OFF,ON]"
-                    enableUncheckedValue="{Boolean}true"
-                    fieldType="checkbox"
-                    name="switch166272266df24"
-                    type="string"
-                    visible="{Boolean}true"/>
-            <switch3
-                    jcr:lastModified="{Date}2023-06-23T16:55:50.978+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Switch 3"
-                    sling:resourceType="core/fd/components/form/switch/v1/switch"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[OFF,ON]"
-                    enableUncheckedValue="{Boolean}true"
-                    fieldType="checkbox"
-                    hideTitle="false"
-                    mandatoryMessage="This is a custom required switch"
-                    name="switch166272sdf63424"
-                    readOnly="{Boolean}false"
-                    required="true"
-                    textIsRich="[true,true]"
-                    type="string"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true"/>
-            <switch4
-                    jcr:lastModified="{Date}2023-06-23T17:16:21.188+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Show Hide SampleSwitch"
-                    sling:resourceType="forms-components-examples/components/form/switch"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[OFF,ON]"
-                    enableUncheckedValue="{Boolean}true"
-                    fieldType="checkbox"
-                    hideTitle="false"
-                    name="switch1687520681298"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true">
-                <fd:rules
-                        fd:valueCommit="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.switch1687520681298&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;switch1687520681298&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;0&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SHOW_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.sampleswitch&quot;\,&quot;displayName&quot;:&quot;Sample Check Box&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Sample Check Box/&quot;\,&quot;name&quot;:&quot;sampleswitch&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;if($field == 'true'\, dispatchEvent(sampleswitch\, 'custom:setProperty'\, {visible : true()})\, {})&quot;]\,&quot;eventName&quot;:&quot;Value Commit&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;},{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.switch1687520681298&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;switch1687520681298&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;1&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;HIDE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.sampleswitch&quot;\,&quot;displayName&quot;:&quot;Sample Check Box&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Sample Check Box/&quot;\,&quot;name&quot;:&quot;sampleswitch&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;if($field == 'false'\, dispatchEvent(sampleswitch\, 'custom:setProperty'\, {visible : false()})\, {})&quot;]\,&quot;eventName&quot;:&quot;Value Commit&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
-                        jcr:primaryType="nt:unstructured"
-                        validationStatus="valid"/>
-                <fd:events
-                        jcr:primaryType="nt:unstructured"
-                        change="[if($field == '0'\, dispatchEvent(sampleswitch\, 'custom:setProperty'\, {visible : true()})\, {}),if($field == '1'\, dispatchEvent(sampleswitch\, 'custom:setProperty'\, {visible : false()})\, {})]"/>
-            </switch4>
-            <switch5
-                    jcr:lastModified="{Date}2023-06-23T17:17:50.729+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Sample Check Box"
-                    sling:resourceType="forms-components-examples/components/form/switch"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[OFF,ON]"
-                    enableUncheckedValue="{Boolean}true"
-                    fieldType="checkbox"
-                    hideTitle="false"
-                    name="sampleswitch"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}false"/>
-            <switch_970636639
-                    jcr:lastModified="{Date}2023-06-26T11:23:56.599+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Enable or Disable a switch 5"
-                    sling:resourceType="forms-components-examples/components/form/switch"
-                    enabled="{Boolean}true"
-                    enum="[0,1]"
-                    enumNames="[OFF,ON]"
-                    enableUncheckedValue="{Boolean}true"
-                    fieldType="checkbox"
-                    hideTitle="false"
-                    name="enabledisable"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true">
-                <fd:rules
-                        fd:valueCommit="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.enabledisable&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;enabledisable&quot;}},{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}},{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;0&quot;}}]},&quot;nested&quot;:false},{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null},{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;ENABLE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.cb5&quot;\,&quot;displayName&quot;:&quot;Check Box 5&quot;\,&quot;type&quot;:&quot;FIELD&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box 5/&quot;\,&quot;name&quot;:&quot;cb5&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}],&quot;isValid&quot;:true,&quot;enabled&quot;:true,&quot;version&quot;:1,&quot;script&quot;:[&quot;if($field.$value == &quot;0&quot;\, dispatchEvent(cb5, &quot;custom:setProperty&quot;\, {enabled : true()}), {})&quot;],&quot;eventName&quot;:&quot;Value Commit&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;},{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.enabledisable&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;enabledisable&quot;}},{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}},{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;1&quot;}}]},&quot;nested&quot;:false},{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null},{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;DISABLE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.cb5&quot;\,&quot;displayName&quot;:&quot;Check Box 5&quot;\,&quot;type&quot;:&quot;FIELD&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box 5/&quot;\,&quot;name&quot;:&quot;cb5&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}],&quot;isValid&quot;:true,&quot;enabled&quot;:true,&quot;version&quot;:1,&quot;script&quot;:[&quot;if($field.$value == &quot;1&quot;\, dispatchEvent(cb5, &quot;custom:setProperty&quot;\, {enabled : false()}), {})&quot;],&quot;eventName&quot;:&quot;Value Commit&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
-                        jcr:primaryType="nt:unstructured"
-                        validationStatus="valid"/>
-                <fd:events
-                        jcr:primaryType="nt:unstructured"
-                        change="[if($field == '0'\, dispatchEvent(cb5\, 'custom:setProperty'\, {enabled : true()})\, {}),if($field == '1'\, dispatchEvent(cb5\, 'custom:setProperty'\, {enabled : false()})\, {})]"/>
-            </switch_970636639>
-            <switch_887779806
-                    jcr:lastModified="{Date}2023-06-26T11:24:07.837+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="Check Box 5"
-                    sling:resourceType="forms-components-examples/components/form/switch"
-                    enabled="{Boolean}false"
-                    enum="[0,1]"
-                    enumNames="[OFF,ON]"
-                    enableUncheckedValue="{Boolean}true"
-                    fieldType="checkbox"
-                    hideTitle="false"
-                    name="cb5"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true"/>
-        </guideContainer>
-    </jcr:content>
-</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/.content.xml
deleted file mode 100644
index 3edadd6c63..0000000000
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/.content.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:mixinTypes="[rep:AccessControllable]"
-    jcr:primaryType="sling:Folder"
-    hidden="true"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml
deleted file mode 100644
index fc040d93fc..0000000000
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
-    jcr:primaryType="cq:Page">
-    <jcr:content
-        cq:deviceGroups="[/etc/mobile/groups/responsive]"
-        cq:lastModified="{Date}2023-09-25T12:26:37.911+05:30"
-        cq:lastModifiedBy="admin"
-        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
-        jcr:language="en"
-        jcr:primaryType="cq:PageContent"
-        jcr:title="tncform"
-        sling:configRef="/conf/forms/core-components-it/samples/text/tncform/"
-        sling:resourceType="forms-components-examples/components/page">
-        <guideContainer
-            fd:version="2.1"
-            jcr:primaryType="nt:unstructured"
-            sling:resourceType="forms-components-examples/components/form/container"
-            dorType="none"
-            fieldType="form"
-            thankYouOption="page"
-            themeRef="/libs/fd/af/themes/canvas"
-            title="tncform">
-            <termsandconditions
-                fd:tnc="{Boolean}true"
-                jcr:created="{Date}2023-09-20T17:27:33.234+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-09-20T17:27:33.234+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Terms And Conditions"
-                sling:resourceType="forms-components-examples/components/form/termsandconditions"
-                fieldType="panel"
-                name="termsandconditions1695211053616"
-                wrapData="{Boolean}true">
-                <text
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="\0"
-                    sling:resourceType="core/fd/components/form/text/v1/text"
-                    fieldType="plain-text"
-                    hideTitle="true"
-                    name="consenttext"
-                    value="Text related to the terms and conditions come here"/>
-                <approvalcheckbox
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="I agree to the terms &amp; conditions"
-                    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
-                    checkedValue="true"
-                    enabled="false"
-                    fieldType="checkbox"
-                    name="approvalcheckbox">
-                    <fd:events
-                        jcr:primaryType="nt:unstructured"
-                        custom_scrollDone="\{enabled: true()}"
-                        custom_scrollInitialized="\{enabled: false()}"/>
-                </approvalcheckbox>
-                <link
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="\0"
-                    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
-                    enum="your-link-here"
-                    enumNames="[label for the link]"
-                    fieldType="checkbox-group"
-                    orientation="vertical"
-                    title="I agree to the terms &amp; conditions"
-                    type="string[]">
-                    <fd:rules
-                        jcr:primaryType="nt:unstructured"
-                        validationStatus="valid"/>
-                    <fd:events
-                        jcr:primaryType="nt:unstructured"
-                        change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
-                </link>
-            </termsandconditions>
-            <termsandconditions_2127535044
-                fd:tnc="{Boolean}true"
-                jcr:created="{Date}2023-09-20T17:27:37.601+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-09-20T17:27:51.862+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Terms And Conditions With Links"
-                sling:resourceType="forms-components-examples/components/form/termsandconditions"
-                enabled="{Boolean}true"
-                fieldType="panel"
-                hideTitle="false"
-                name="termsandconditions_21275350441695211057886"
-                readOnly="{Boolean}false"
-                showApprovalOption="true"
-                showLink="{Boolean}true"
-                textIsRich="[true,true]"
-                visible="{Boolean}true"
-                wrapData="{Boolean}true">
-                <text
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="\0"
-                    sling:resourceType="core/fd/components/form/text/v1/text"
-                    fieldType="plain-text"
-                    hideTitle="true"
-                    name="consenttext"
-                    value="Text related to the terms and conditions come here"/>
-                <approvalcheckbox
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="I agree to the terms &amp; conditions"
-                    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
-                    checkedValue="true"
-                    enabled="false"
-                    fieldType="checkbox"
-                    name="approvalcheckbox">
-                    <fd:events
-                        jcr:primaryType="nt:unstructured"
-                        custom_scrollDone="\{enabled: true()}"
-                        custom_scrollInitialized="\{enabled: false()}"/>
-                </approvalcheckbox>
-                <link
-                    jcr:lastModified="{Date}2023-09-20T17:28:00.048+05:30"
-                    jcr:lastModifiedBy="admin"
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
-                    enabled="{Boolean}true"
-                    enum="http://localhost"
-                    enumNames="label for the link"
-                    fieldType="checkbox-group"
-                    hideTitle="false"
-                    name="link1695211072051"
-                    orientation="vertical"
-                    readOnly="{Boolean}false"
-                    textIsRich="[true,true]"
-                    title="I agree to the terms &amp; conditions"
-                    type="string[]"
-                    unboundFormElement="{Boolean}false"
-                    visible="{Boolean}true">
-                    <fd:rules
-                        jcr:primaryType="nt:unstructured"
-                        validationStatus="valid"/>
-                    <fd:events
-                        jcr:primaryType="nt:unstructured"
-                        change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
-                </link>
-            </termsandconditions_2127535044>
-            <termsandconditions_143203533
-                fd:tnc="{Boolean}true"
-                jcr:created="{Date}2023-09-25T12:26:21.805+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-09-25T12:26:37.891+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Terms And Conditions With Popup"
-                sling:resourceType="forms-components-examples/components/form/termsandconditions"
-                enabled="{Boolean}true"
-                fieldType="panel"
-                hideTitle="false"
-                name="popuptnc"
-                readOnly="{Boolean}false"
-                showApprovalOption="true"
-                showAsPopup="true"
-                showLink="{Boolean}false"
-                textIsRich="[true,true]"
-                visible="{Boolean}true"
-                wrapData="{Boolean}true">
-                <text
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="\0"
-                    sling:resourceType="core/fd/components/form/text/v1/text"
-                    fieldType="plain-text"
-                    hideTitle="true"
-                    name="consenttext"
-                    value="Text related to the terms and conditions come here"/>
-                <approvalcheckbox
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="I agree to the terms &amp; conditions"
-                    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
-                    checkedValue="true"
-                    enabled="false"
-                    fieldType="checkbox"
-                    name="approvalcheckbox">
-                    <fd:events
-                        jcr:primaryType="nt:unstructured"
-                        custom_scrollDone="\{enabled: true()}"
-                        custom_scrollInitialized="\{enabled: false()}"/>
-                </approvalcheckbox>
-                <link
-                    jcr:primaryType="nt:unstructured"
-                    jcr:title="\0"
-                    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
-                    enum="your-link-here"
-                    enumNames="[label for the link]"
-                    fieldType="checkbox-group"
-                    orientation="vertical"
-                    title="I agree to the terms &amp; conditions"
-                    type="string[]">
-                    <fd:rules
-                        jcr:primaryType="nt:unstructured"
-                        validationStatus="valid"/>
-                    <fd:events
-                        jcr:primaryType="nt:unstructured"
-                        change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
-                </link>
-            </termsandconditions_143203533>
-        </guideContainer>
-    </jcr:content>
-</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/sites/core-components-it/aemembedmutipleform/.content.xml b/it/content/src/main/content/jcr_root/content/forms/sites/core-components-it/aemembedmutipleform/.content.xml
deleted file mode 100644
index 28f4d381f4..0000000000
--- a/it/content/src/main/content/jcr_root/content/forms/sites/core-components-it/aemembedmutipleform/.content.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-          jcr:primaryType="cq:Page">
-    <jcr:content
-            cq:lastModified="{Date}2023-08-02T10:36:18.709+05:30"
-            cq:lastModifiedBy="admin"
-            cq:tags="[]"
-            cq:template="/conf/core-components-examples/settings/wcm/templates/content-page"
-            jcr:description="Aem Embed Container Runtime test"
-            jcr:primaryType="cq:PageContent"
-            jcr:title="Aem Embed Container"
-            sling:resourceType="forms-components-examples/components/page">
-        <root
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="wcm/foundation/components/responsivegrid">
-            <responsivegrid
-                    jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/responsivegrid">
-                <aemform1
-                        jcr:lastModified="{Date}2023-08-02T10:36:18.704+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="forms-components-examples/components/aemform"
-                        enableFocusOnFirstField="{Boolean}true"
-                        formRef="/content/dam/formsanddocuments/core-components-it/samples/textinput/basic"
-                        submitType="inline"
-                        textIsRich="true"
-                        useiframe="false"
-                        usePageLocale="true"/>
-                <aemform2
-                        jcr:lastModified="{Date}2023-08-02T10:36:18.704+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="forms-components-examples/components/aemform"
-                        enableFocusOnFirstField="{Boolean}true"
-                        formRef="/content/dam/formsanddocuments/core-components-it/samples/emailinput/basic"
-                        submitType="inline"
-                        textIsRich="true"
-                        useiframe="false"
-                        usePageLocale="true"/>
-              <aemform3
-                        jcr:lastModified="{Date}2023-08-02T10:36:18.704+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="forms-components-examples/components/aemform"
-                        enableFocusOnFirstField="{Boolean}true"
-                        formRef="/content/dam/formsanddocuments/core-components-it/samples/wizard/repeatability"
-                        submitType="inline"
-                        textIsRich="true"
-                        useiframe="false"
-                        usePageLocale="true"/>
-            </responsivegrid>
-        </root>
-    </jcr:content>
-</jcr:root>
diff --git a/parent/pom.xml b/parent/pom.xml
index c486b117fb..70d05a7912 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1119,7 +1119,7 @@
             <dependency>
                 <groupId>com.adobe.aem</groupId>
                 <artifactId>aem-forms-sdk-api</artifactId>
-                <version>2023.10.09.00-230901</version>
+                <version>2023.09.06.04-230800</version>
             </dependency>
 
             <dependency>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index 26e66cd589..282f9771b2 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -321,9 +321,6 @@
                                         <replace file="target/jcr_root/libs/core/fd/components/form/pageheader/v1/pageheader/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/fragment/v1/fragment/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/fragmentcontainer/v1/fragmentcontainer/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
-                                        <replace file="target/jcr_root/libs/core/fd/components/form/switch/v1/switch/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
-                                        <replace file="target/jcr_root/libs/core/fd/components/form/checkbox/v1/checkbox/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
-                                        <replace file="target/jcr_root/libs/core/fd/components/form/termsandconditions/v1/termsandconditions/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                     </tasks>
                                 </configuration>
                                 <goals>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
index a1bfd14f54..d123445537 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
@@ -5,4 +5,4 @@
     cssProcessor="[default:none,min:none]"
     jsProcessor="[default:none,min:none]"
     categories="[core.forms.components.runtime.all]"
-    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v1.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v1.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime]"/>
+    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v1.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v1.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html
index 823bd9bd9b..07f79c829e 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html
@@ -1,4 +1,4 @@
-<template data-sly-template.label="${@ componentId, labelValue, labelVisible, labelRichText, bemBlock}">
+<template data-sly-template.label="${@ componentId, labelValue, labelVisible, bemBlock}">
   <label for="${componentId}" class="${bemBlock}__label"
-         data-sly-test="${labelValue && (labelVisible==null || labelVisible==true)}" data-richtext="${labelRichText}">${labelValue @ context = labelRichText ? 'html' : 'text'}</label>
+         data-sly-test="${labelValue && (labelVisible==null || labelVisible==true)}">${labelValue}</label>
 </template>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_editConfig.xml
index e288e7d1a8..076570341c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_editConfig.xml
@@ -37,10 +37,5 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/accordion.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/accordion.html
index 9f52937ec9..f899530489 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/accordion.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/accordion.html
@@ -30,7 +30,7 @@
      data-placeholder-text="${wcmmode.edit && 'Please drag Accordion item components here' @ i18n}">
 
     <div class="cmp-accordion__label-container">
-      <div data-sly-call="${label.label @componentId=accordion.id, labelValue=accordion.label.value, labelVisible=accordion.label.visible, labelRichText=accordion.label.richText, bemBlock='cmp-accordion'}"
+      <div data-sly-call="${label.label @componentId=accordion.id, labelValue=accordion.label.value, labelVisible=accordion.label.visible, bemBlock='cmp-accordion'}"
           data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=accordion.id, longDescription=accordion.description, bemBlock='cmp-accordion'}"
           data-sly-unwrap></div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
index 3d0a30abb2..3bde75e10c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
@@ -18,7 +18,7 @@
     jcr:primaryType="nt:unstructured"
     jcr:title=""
     sling:resourceType="cq/gui/components/authoring/dialog"
-    extraClientlibs="[core.forms.components.base.v1.editor]">
+    extraClientLibs="[core.forms.components.base.v1.editor]">
     <content
         jcr:primaryType="nt:unstructured"
         sling:resourceType="granite/ui/components/coral/foundation/container">
@@ -55,132 +55,11 @@
                                                         jcr:primaryType="nt:unstructured"
                                                         node-name-validation=""/>
                                             </name>
-                                            <title jcr:primaryType="nt:unstructured"
-                                                   granite:class="cmp-adaptiveform-base__title"
-                                                   sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                   fieldLabel="Title"
-                                                   name="./jcr:title"/>
-                                            <richTextTitle jcr:primaryType="nt:unstructured"
-                                                           wrapperClass="cmp-adaptiveform-base__richtexttitle"
-                                                           sling:resourceType="cq/gui/components/authoring/dialog/richtext"
-                                                           fieldLabel="Title"
-                                                           name="richTextTitle"
-                                                           useFixedInlineToolbar="{Boolean}true">
-                                                <rtePlugins jcr:primaryType="nt:unstructured">
-                                                    <links jcr:primaryType="nt:unstructured">
-                                                        <linkDialogConfig
-                                                                jcr:primaryType="nt:unstructured"
-                                                                height="{Long}316">
-                                                            <linkAttributes jcr:primaryType="cq:WidgetCollection">
-                                                                <linkAdvanced
-                                                                        jcr:primaryType="cq:Widget"
-                                                                        collapsed="{Boolean}true"
-                                                                        collapsible="{Boolean}true"
-                                                                        inputValue="advanced"
-                                                                        name="./linkdialog/cq:adhocLinkTrackingTab"
-                                                                        title="Link tracking">
-                                                                    <items jcr:primaryType="cq:WidgetCollection">
-                                                                        <enable
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                attribute="enabletracking"
-                                                                                fieldDescription="override analytics framework settings."
-                                                                                fieldLabel="Custom link tracking"
-                                                                                name="./linkdialog/cq:adhocLinkTrackingEnableTracking"
-                                                                                xtype="checkbox">
-                                                                            <listeners
-                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                    check="function(component){var dlg=component.findParentByType('rtelinkdialog');dlg.enableSCFields(component.checked);}"/>
-                                                                        </enable>
-                                                                        <events
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                attribute="adhocevents"
-                                                                                fieldDescription="e.g.: event2, event7."
-                                                                                fieldLabel="Include SiteCatalyst events"
-                                                                                name="./linkdialog/cq:adhocLinkTrackingEvents"
-                                                                                xtype="textfield"/>
-                                                                        <evars
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                attribute="adhocevars"
-                                                                                fieldDescription="e.g.: eVar1: pagedata.url, prop4: 'const'."
-                                                                                fieldLabel="Include SiteCatalyst variables"
-                                                                                name="./linkdialog/cq:adhocLinkTrackingEvars"
-                                                                                xtype="textfield"/>
-                                                                    </items>
-                                                                </linkAdvanced>
-                                                            </linkAttributes>
-                                                        </linkDialogConfig>
-                                                    </links>
-                                                    <misctools
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <edit
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <findreplace
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <format
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <undo
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <subsuperscript
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <lists
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <justify
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <paraformat
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                    <fullscreen
-                                                            jcr:primaryType="nt:unstructured"
-                                                            features="*"/>
-                                                </rtePlugins>
-                                                <uiSettings jcr:primaryType="nt:unstructured">
-                                                    <cui jcr:primaryType="nt:unstructured">
-                                                        <inline
-                                                                jcr:primaryType="nt:unstructured"
-                                                                toolbar="[#format,-,#justify,-,#lists,-,fullscreen#start]">
-                                                            <popovers jcr:primaryType="nt:unstructured">
-                                                                <justify
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        items="[justify#justifyleft,justify#justifycenter,justify#justifyright]"
-                                                                        ref="justify"/>
-                                                                <lists
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        items="[lists#unordered,lists#ordered,lists#outdent,lists#indent]"
-                                                                        ref="lists"/>
-                                                                <format
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        items="[format#bold,format#italic,format#underline]"
-                                                                        ref="format"/>
-                                                            </popovers>
-                                                        </inline>
-                                                        <fullscreen
-                                                                jcr:primaryType="nt:unstructured"
-                                                                toolbar="[format#bold,format#italic,format#underline,subsuperscript#subscript,subsuperscript#superscript,justify#justifyleft,justify#justifycenter,justify#justifyright,lists#unordered,lists#ordered,lists#outdent,lists#indent,undo#undo,undo#redo,edit#cut,edit#copy,edit#paste-default,edit#paste-plaintext,edit#paste-wordhtml,links#modifylink,links#unlink,links#anchor,findreplace#find,findreplace#replace,misctools#specialchars,#paraformat,fullscreen#finish]">
-                                                            <popovers jcr:primaryType="nt:unstructured">
-                                                                <paraformat
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        items="paraformat:getFormats:paraformat-pulldown"
-                                                                        ref="paraformat"/>
-                                                            </popovers>
-                                                        </fullscreen>
-                                                    </cui>
-                                                </uiSettings>
-                                            </richTextTitle>
-                                            <isTitleRichText
+                                            <title
                                                     jcr:primaryType="nt:unstructured"
-                                                    granite:class="cmp-adaptiveform-base__istitlerichtext"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                                                    name="./isTitleRichText"
-                                                    text="Allow Rich Text for Title"
-                                                    value="true"/>
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                    fieldLabel="Title"
+                                                    name="./jcr:title"/>
                                             <hideTitle
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
@@ -222,121 +101,6 @@
                                                                         fieldLabel="Display text"
                                                                         fieldDescription="Specify the content to display in the adaptive form."
                                                                         required="{Boolean}false"/>
-                                                                <richTextEnumNames jcr:primaryType="nt:unstructured"
-                                                                                   sling:resourceType="cq/gui/components/authoring/dialog/richtext"
-                                                                                   wrapperClass="cmp-adaptiveform-base__richTextEnumNames"
-                                                                                   name="richTextEnumNames"
-                                                                                   fieldLabel="Display text"
-                                                                                   fieldDescription="Specify the content to display in the adaptive form."
-                                                                                   useFixedInlineToolbar="{Boolean}true">
-                                                                    <rtePlugins jcr:primaryType="nt:unstructured">
-                                                                        <links jcr:primaryType="nt:unstructured">
-                                                                            <linkDialogConfig
-                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                    height="{Long}316">
-                                                                                <linkAttributes jcr:primaryType="cq:WidgetCollection">
-                                                                                    <linkAdvanced
-                                                                                            jcr:primaryType="cq:Widget"
-                                                                                            collapsed="{Boolean}true"
-                                                                                            collapsible="{Boolean}true"
-                                                                                            inputValue="advanced"
-                                                                                            name="./linkdialog/cq:adhocLinkTrackingTab"
-                                                                                            title="Link tracking">
-                                                                                        <items jcr:primaryType="cq:WidgetCollection">
-                                                                                            <enable
-                                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                                    attribute="enabletracking"
-                                                                                                    fieldDescription="override analytics framework settings."
-                                                                                                    fieldLabel="Custom link tracking"
-                                                                                                    name="./linkdialog/cq:adhocLinkTrackingEnableTracking"
-                                                                                                    xtype="checkbox">
-                                                                                                <listeners
-                                                                                                        jcr:primaryType="nt:unstructured"
-                                                                                                        check="function(component){var dlg=component.findParentByType('rtelinkdialog');dlg.enableSCFields(component.checked);}"/>
-                                                                                            </enable>
-                                                                                            <events
-                                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                                    attribute="adhocevents"
-                                                                                                    fieldDescription="e.g.: event2, event7."
-                                                                                                    fieldLabel="Include SiteCatalyst events"
-                                                                                                    name="./linkdialog/cq:adhocLinkTrackingEvents"
-                                                                                                    xtype="textfield"/>
-                                                                                            <evars
-                                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                                    attribute="adhocevars"
-                                                                                                    fieldDescription="e.g.: eVar1: pagedata.url, prop4: 'const'."
-                                                                                                    fieldLabel="Include SiteCatalyst variables"
-                                                                                                    name="./linkdialog/cq:adhocLinkTrackingEvars"
-                                                                                                    xtype="textfield"/>
-                                                                                        </items>
-                                                                                    </linkAdvanced>
-                                                                                </linkAttributes>
-                                                                            </linkDialogConfig>
-                                                                        </links>
-                                                                        <misctools
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <edit
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <findreplace
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <format
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <undo
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <subsuperscript
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <lists
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <justify
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <paraformat
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                        <fullscreen
-                                                                                jcr:primaryType="nt:unstructured"
-                                                                                features="*"/>
-                                                                    </rtePlugins>
-                                                                    <uiSettings jcr:primaryType="nt:unstructured">
-                                                                        <cui jcr:primaryType="nt:unstructured">
-                                                                            <inline
-                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                    toolbar="[#format,-,#justify,fullscreen#start]">
-                                                                                <popovers jcr:primaryType="nt:unstructured">
-                                                                                    <justify
-                                                                                            jcr:primaryType="nt:unstructured"
-                                                                                            items="[justify#justifyleft,justify#justifycenter,justify#justifyright]"
-                                                                                            ref="justify"/>
-                                                                                    <lists
-                                                                                            jcr:primaryType="nt:unstructured"
-                                                                                            items="[lists#unordered,lists#ordered,lists#outdent,lists#indent]"
-                                                                                            ref="lists"/>
-                                                                                    <format
-                                                                                            jcr:primaryType="nt:unstructured"
-                                                                                            items="[format#bold,format#italic,format#underline]"
-                                                                                            ref="format"/>
-                                                                                </popovers>
-                                                                            </inline>
-                                                                            <fullscreen
-                                                                                    jcr:primaryType="nt:unstructured"
-                                                                                    toolbar="[format#bold,format#italic,format#underline,subsuperscript#subscript,subsuperscript#superscript,justify#justifyleft,justify#justifycenter,justify#justifyright,lists#unordered,lists#ordered,lists#outdent,lists#indent,undo#undo,undo#redo,edit#cut,edit#copy,edit#paste-default,edit#paste-plaintext,edit#paste-wordhtml,links#modifylink,links#unlink,links#anchor,findreplace#find,findreplace#replace,misctools#specialchars,#paraformat,fullscreen#finish]">
-                                                                                <popovers jcr:primaryType="nt:unstructured">
-                                                                                    <paraformat
-                                                                                            jcr:primaryType="nt:unstructured"
-                                                                                            items="paraformat:getFormats:paraformat-pulldown"
-                                                                                            ref="paraformat"/>
-                                                                                </popovers>
-                                                                            </fullscreen>
-                                                                        </cui>
-                                                                    </uiSettings>
-                                                                </richTextEnumNames>
                                                             </items>
                                                         </field>
                                                     </enumOptions>
@@ -349,13 +113,6 @@
                                                                granite:class="cmp-adaptiveform-base__enumNamesHidden"
                                                                granite:hidden="true"/>
                                                     </enumNames>
-                                                    <areOptionsRichText
-                                                            jcr:primaryType="nt:unstructured"
-                                                            granite:class="cmp-adaptiveform-base__areOptionsRichText"
-                                                            sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                                                            name="./areOptionsRichText"
-                                                            text="Allow Rich Text for Options"
-                                                            value="true"/>
                                                 </items>
                                             </enums>
                                             <bindref
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
index ddee2ddfb1..c2a57e535f 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
@@ -18,138 +18,15 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-            jcr:primaryType="nt:unstructured"
-            handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-            icon="viewSOMExpression"
-            text="View Qualified Name"/>
     </cq:actionConfigs>
     <cq:inplaceEditing
             jcr:primaryType="cq:InplaceEditingConfig"
             active="{Boolean}true"
             configPath="inplaceEditingConfig"
-            editorType="text">
+            editorType="plaintext">
         <inplaceEditingConfig
                 jcr:primaryType="nt:unstructured"
                 editElementQuery="label:first"
-                textPropertyName="jcr:title">
-            <rtePlugins jcr:primaryType="nt:unstructured">
-                <footnoteplugin
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <links jcr:primaryType="nt:unstructured">
-                    <linkDialogConfig
-                            jcr:primaryType="nt:unstructured"
-                            height="{Long}316">
-                        <linkAttributes jcr:primaryType="cq:WidgetCollection">
-                            <linkAdvanced
-                                    jcr:primaryType="cq:Widget"
-                                    collapsed="{Boolean}true"
-                                    collapsible="{Boolean}true"
-                                    inputValue="advanced"
-                                    name="./linkdialog/cq:adhocLinkTrackingTab"
-                                    title="Link tracking">
-                                <items jcr:primaryType="cq:WidgetCollection">
-                                    <enable
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="enabletracking"
-                                            fieldDescription="override analytics framework settings."
-                                            fieldLabel="Custom link tracking"
-                                            name="./linkdialog/cq:adhocLinkTrackingEnableTracking"
-                                            xtype="checkbox">
-                                        <listeners
-                                                jcr:primaryType="nt:unstructured"
-                                                check="function(component){var dlg=component.findParentByType('rtelinkdialog');dlg.enableSCFields(component.checked);}"/>
-                                    </enable>
-                                    <events
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="adhocevents"
-                                            fieldDescription="e.g.: event2, event7."
-                                            fieldLabel="Include SiteCatalyst events"
-                                            name="./linkdialog/cq:adhocLinkTrackingEvents"
-                                            xtype="textfield"/>
-                                    <evars
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="adhocevars"
-                                            fieldDescription="e.g.: eVar1: pagedata.url, prop4: 'const'."
-                                            fieldLabel="Include SiteCatalyst variables"
-                                            name="./linkdialog/cq:adhocLinkTrackingEvars"
-                                            xtype="textfield"/>
-                                </items>
-                            </linkAdvanced>
-                        </linkAttributes>
-                    </linkDialogConfig>
-                </links>
-                <misctools
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <edit
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <findreplace
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <format
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <undo
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <subsuperscript
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <lists
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <justify
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <paraformat
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-            </rtePlugins>
-            <uiSettings jcr:primaryType="nt:unstructured">
-                <cui jcr:primaryType="nt:unstructured">
-                    <inline
-                            jcr:primaryType="nt:unstructured"
-                            toolbar="[#format,-,#justify,-,#lists,-,links#modifylink,links#unlink,-,footnoteplugin#footnotecommand,-,fullscreen#start,-,control#close,control#save]">
-                        <popovers jcr:primaryType="nt:unstructured">
-                            <justify
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[justify#justifyleft,justify#justifycenter,justify#justifyright]"
-                                    ref="justify"/>
-                            <lists
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[lists#unordered,lists#ordered,lists#outdent,lists#indent]"
-                                    ref="lists"/>
-                            <format
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[format#bold,format#italic,format#underline]"
-                                    ref="format"/>
-                            <paraformat
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[paraformat:getFormats:paraformat-pulldown]"
-                                    ref="paraformat"/>
-                        </popovers>
-                    </inline>
-                    <fullscreen
-                            jcr:primaryType="nt:unstructured"
-                            toolbar="[format#bold,format#italic,format#underline,subsuperscript#subscript,subsuperscript#superscript,justify#justifyleft,justify#justifycenter,justify#justifyright,lists#unordered,lists#ordered,lists#outdent,lists#indent,undo#undo,undo#redo,edit#cut,edit#copy,edit#paste-default,edit#paste-plaintext,edit#paste-wordhtml,links#modifylink,links#unlink,footnoteplugin#footnotecommand,links#anchor,findreplace#find,findreplace#replace,misctools#specialchars,#paraformat,fullscreen#finish]">
-                        <popovers jcr:primaryType="nt:unstructured">
-                            <paraformat
-                                    jcr:primaryType="nt:unstructured"
-                                    items="paraformat:getFormats:paraformat-pulldown"
-                                    ref="paraformat"/>
-                        </popovers>
-                    </fullscreen>
-                    <additionalClasses jcr:primaryType="nt:unstructured">
-                        <footnotecommand
-                                jcr:primaryType="nt:unstructured"
-                                classes="rte--trigger"
-                                command="footnoteplugin#footnotecommand"/>
-                    </additionalClasses>
-                </cui>
-            </uiSettings>
-        </inplaceEditingConfig>
+                textPropertyName="jcr:title"/>
     </cq:inplaceEditing>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/js/editDialog.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/js/editDialog.js
index 0451eb633b..f9f17028ec 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/js/editDialog.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/clientlibs/editor/js/editDialog.js
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-(function($, ns, channel) {
+(function($, ns, channel, Coral) {
     "use strict";
 
-    let EDIT_DIALOG = ".cmp-adaptiveform-base__editdialogbasic",
+    var EDIT_DIALOG = ".cmp-adaptiveform-base__editdialogbasic",
         BASE_REQUIRED = ".cmp-adaptiveform-base__required",
         BASE_ASSISTPRIORITY = ".cmp-adaptiveform-base__assistpriority",
         BASE_VISIBLE = ".cmp-adaptiveform-base__visible",
@@ -25,20 +25,9 @@
         BASE_ENUMNAMES_VISIBLE = ".cmp-adaptiveform-base__enumNames",
         BASE_ENUMNAMES_HIDDEN = ".cmp-adaptiveform-base__enumNamesHidden",
         BASE_ASSISTPRIORITY_CUSTOMTEXT = ".cmp-adaptiveform-base__assistpriority-customtext",
-        BASE_TITLE = ".cmp-adaptiveform-base__title",
-        BASE_RICH_TEXT_TITLE_NAME = "cmp-adaptiveform-base__richtexttitle",
-        BASE_RICH_TEXT_TITLE = "."+ BASE_RICH_TEXT_TITLE_NAME,
-        BASE_WRAPPER_INPUT_RICH_TEXT_TITLE = "[data-cq-richtext-input='true'][data-wrapperclass='" + BASE_RICH_TEXT_TITLE_NAME + "']",
-        BASE_WRAPPER_VALUE_RICH_TEXT_TITLE = "[data-cq-richtext-editable='true'][data-wrapperclass='" + BASE_RICH_TEXT_TITLE_NAME + "']",
-        BASE_IS_TITLE_RICH_TEXT = ".cmp-adaptiveform-base__istitlerichtext",
-        BASE_RICH_TEXT_ENUMNAMES_NAME = "cmp-adaptiveform-base__richTextEnumNames",
-        BASE_RICH_TEXT_ENUMNAMES = "." + BASE_RICH_TEXT_ENUMNAMES_NAME,
-        BASE_WRAPPER_INPUT_RICH_TEXT_ENUMNAMES = "[data-cq-richtext-input='true'][data-wrapperclass='" + BASE_RICH_TEXT_ENUMNAMES_NAME + "']",
-        BASE_WRAPPER_VALUE_RICH_TEXT_ENUMNAMES = "[data-cq-richtext-editable='true'][data-wrapperclass='" + BASE_RICH_TEXT_ENUMNAMES_NAME + "']",
-        BASE_ARE_OPTIONS_RICH_TEXT = ".cmp-adaptiveform-base__areOptionsRichText",
+        BASE_DORBINDREF = ".cmp-adaptiveform-base__dorBindRef",
         V2_ADAPTIVE_FORM_CONTAINER_COMPONENT_ATTRIBUTE = "form[data-cmp-is='adaptiveFormContainer']",
         V2_ADAPTIVE_FORM_CONTAINER_COMPONENT_PATH_ATTRIBUTE = "data-cmp-path",
-        BASE_ENUM_MULTIFIELD_ADD_BUTTON = "coral-multifield[data-granite-coral-multifield-name='./enum'] button[coral-multifield-add]",
         Utils = window.CQ.FormsCoreComponents.Utils.v1;
 
 
@@ -166,70 +155,6 @@
         }
     }
 
-    /**
-     * hides the RTE/plain text field on the basis of rich text checkbox and
-     * resolves it's value.
-     *
-     * @param {HTMLElement} dialog The dialog on which the operation is to be performed.
-     * @param isTitleRichText is rich text checkbox selected.
-     * @param isToggled is this function being called on toggle of rich text checkbox.
-     */
-    function resolveRichText(dialog, isTitleRichText, isToggled) {
-        let title = dialog.find(BASE_TITLE)[0],
-            richTextTitle = dialog.find(BASE_RICH_TEXT_TITLE)[0],
-            richTextTitleDiv = dialog.find("[data-cq-richtext-editable='true'][data-wrapperclass='cmp-adaptiveform-base__richtexttitle']")[0];
-        if(isTitleRichText.checked){
-            Utils.hideComponent(title, "div");
-            Utils.showComponent(richTextTitle, "div");
-            copyTextValueToRte(title, richTextTitleDiv);
-        } else {
-            Utils.hideComponent(richTextTitle, "div");
-            Utils.showComponent(title, "div");
-            if(isToggled){
-                title.value = $('<div>').html(richTextTitleDiv.innerHTML).text();
-            }
-        }
-    }
-
-    /**
-     * hides the RTE/plain text field on the basis of rich text checkbox and
-     * resolves it's value for enumNAmes/Options.
-     *
-     * @param {HTMLElement} dialog The dialog on which the operation is to be performed.
-     * @param areOptionsRichText is rich text checkbox selected.
-     * @param isToggled is this function being called on toggle of rich text checkbox.
-     */
-    function resolveRichTextOptions(dialog, areOptionsRichText, isToggled) {
-        let enumNames = dialog.find(BASE_ENUMNAMES_VISIBLE),
-            richTextEnumNames = dialog.find(BASE_RICH_TEXT_ENUMNAMES),
-            richTextEnumNamesDiv = dialog.find("[data-cq-richtext-editable='true'][data-wrapperclass='cmp-adaptiveform-base__richTextEnumNames']");
-        if(areOptionsRichText != null && areOptionsRichText.checked){
-            for (let i = 0; i < richTextEnumNames.length; i++) {
-                Utils.hideComponent(enumNames[i], "div");
-                Utils.showComponent(richTextEnumNames[i], "div");
-                copyTextValueToRte(enumNames[i], richTextEnumNamesDiv[i]);
-            }
-        } else {
-            for (let i = 0; i < richTextEnumNames.length; i++) {
-                Utils.hideComponent(richTextEnumNames[i], "div");
-                Utils.showComponent(enumNames[i], "div");
-                if(isToggled){
-                    enumNames[i].value = $('<div>').html(richTextEnumNamesDiv[i].innerHTML).text();
-                }
-            }
-        }
-    }
-
-    function copyTextValueToRte (textElem, richTextElem) {
-        richTextElem.innerHTML = Utils.encodeScriptableTags(textElem.value);
-    }
-
-    function changeTextValue(textValue, richTextValue) {
-        if(textValue && richTextValue) {
-            textValue.value = Utils.encodeScriptableTags(richTextValue.value);
-        }
-    }
-
     /**
      * Initialise the conditional display of the various elements of the dialog.
      *
@@ -237,9 +162,7 @@
      */
     function initialise(dialog) {
         dialog = $(dialog);
-        let baseRequired = dialog.find(BASE_REQUIRED)[0],
-            isTitleRichText = dialog.find(BASE_IS_TITLE_RICH_TEXT)[0],
-            areOptionsRichText = dialog.find(BASE_ARE_OPTIONS_RICH_TEXT)[0];
+        var baseRequired = dialog.find(BASE_REQUIRED)[0];
         if (baseRequired) {
             handleRequired(dialog, baseRequired);
             baseRequired.on("change", function() {
@@ -251,69 +174,14 @@
         showHideDoRBindRefField(dialog);
         validateName();
         handleDialogSubmit(dialog);
-        if (isTitleRichText) {
-            resolveRichText(dialog, isTitleRichText, false);
-            isTitleRichText.on("change", function() {
-                resolveRichText(dialog, isTitleRichText, true);
-            });
-        }
-        if (areOptionsRichText) {
-            resolveRichTextOptions(dialog, areOptionsRichText, false);
-            areOptionsRichText.on("change", function() {
-                resolveRichTextOptions(dialog, areOptionsRichText, true);
-            });
-        }
     }
 
-    /**
-     * whenever RTE value of enumName is changed, we save it's value corresponding to text value field.
-     */
-    function updateEnumNamesOnChange(){
-        channel.on("change", BASE_WRAPPER_VALUE_RICH_TEXT_ENUMNAMES, function (e) {
-            let richTextValue = channel.find(BASE_WRAPPER_INPUT_RICH_TEXT_ENUMNAMES),
-                textValue = channel.find(BASE_ENUMNAMES_VISIBLE);
-            for(let i=0; i<textValue.length; i++){
-                if(textValue[i] && richTextValue[i]){
-                    changeTextValue(textValue[i], richTextValue[i]);
-                }
-            }
-        });
-    };
-
-    /**
-     * whenever RTE value of richTextTitle is changed, we save it's value to corresponding text value field.
-     */
-    function updateRichTextTitleOnChange() {
-        channel.on("change", BASE_WRAPPER_VALUE_RICH_TEXT_TITLE, function (e) {
-            var richTextValue = channel.find(BASE_WRAPPER_INPUT_RICH_TEXT_TITLE)[0],
-                textValue = channel.find(BASE_TITLE)[0];
-            changeTextValue(textValue, richTextValue);
-        });
-    };
-
-    /**
-     * whenever we add a new option for enums,
-     * we want to hide it's RTE/plain text field on the basis rich text checkbox.
-     */
-    function updateEnumNamesOnAdd() {
-        channel.on("click", BASE_ENUM_MULTIFIELD_ADD_BUTTON, function (e) {
-            let areOptionsRichText = $(BASE_ARE_OPTIONS_RICH_TEXT)[0],
-                enumNames = $(BASE_ENUMNAMES_VISIBLE),
-                richTextEnumNames = $(BASE_RICH_TEXT_ENUMNAMES);
-            if(areOptionsRichText != null && areOptionsRichText.checked){
-                for (let i = 0; i < richTextEnumNames.length; i++) {
-                    Utils.hideComponent(enumNames[i], "div");
-                    Utils.showComponent(richTextEnumNames[i], "div");
-                }
-            } else {
-                for (let i = 0; i < richTextEnumNames.length; i++) {
-                    Utils.hideComponent(richTextEnumNames[i], "div");
-                    Utils.showComponent(enumNames[i], "div");
-                }
-            }
-        });
-    };
-
-    Utils.initializeEditDialog(EDIT_DIALOG)(initialise, updateRichTextTitleOnChange, updateEnumNamesOnAdd, updateEnumNamesOnChange);
+    channel.on("foundation-contentloaded", function(e) {
+        if ($(e.target).find(EDIT_DIALOG).length > 0) {
+            Coral.commons.ready(e.target, function(component) {
+                initialise(component);
+            });
+        }
+    });
 
-})(jQuery, Granite.author, jQuery(document));
\ No newline at end of file
+})(jQuery, Granite.author, jQuery(document), Coral);
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_dialog/.content.xml
index d16db42398..517ce55741 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_dialog/.content.xml
@@ -18,7 +18,6 @@
   jcr:primaryType="nt:unstructured"
   jcr:title="Adaptive Form Button"
   sling:resourceType="cq/gui/components/authoring/dialog"
-  extraClientlibs="[core.forms.components.base.v1.editor]"
   helpPath="https://www.adobe.com/go/aem_af_cmp_button_v1"
   trackingFeature="core-components:adaptiveform-button:v1">
   <content
@@ -38,7 +37,8 @@
               jcr:title="Basic"
               sling:resourceType="granite/ui/components/coral/foundation/container">
               <items 
-                jcr:primaryType="nt:unstructured">
+                jcr:primaryType="nt:unstructured"
+                sling:hideChildren="[hideTitle,placeholder]">
                 <columns
                         jcr:primaryType="nt:unstructured"
                         sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
@@ -47,8 +47,7 @@
                     <column
                             jcr:primaryType="nt:unstructured"
                             sling:resourceType="granite/ui/components/coral/foundation/container">
-                      <items jcr:primaryType="nt:unstructured"
-                             sling:hideChildren="[hideTitle,placeholder]">
+                      <items jcr:primaryType="nt:unstructured">
                         <value
                                 jcr:primaryType="nt:unstructured"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_editConfig.xml
index 3e6675c4ea..0d0649dadf 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_editConfig.xml
@@ -18,138 +18,15 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
     <cq:inplaceEditing
             jcr:primaryType="cq:InplaceEditingConfig"
             active="{Boolean}true"
             configPath="inplaceEditingConfig"
-            editorType="text">
+            editorType="plaintext">
         <inplaceEditingConfig
                 jcr:primaryType="nt:unstructured"
                 editElementQuery="span:first"
-                textPropertyName="jcr:title">
-            <rtePlugins jcr:primaryType="nt:unstructured">
-                <footnoteplugin
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <links jcr:primaryType="nt:unstructured">
-                    <linkDialogConfig
-                            jcr:primaryType="nt:unstructured"
-                            height="{Long}316">
-                        <linkAttributes jcr:primaryType="cq:WidgetCollection">
-                            <linkAdvanced
-                                    jcr:primaryType="cq:Widget"
-                                    collapsed="{Boolean}true"
-                                    collapsible="{Boolean}true"
-                                    inputValue="advanced"
-                                    name="./linkdialog/cq:adhocLinkTrackingTab"
-                                    title="Link tracking">
-                                <items jcr:primaryType="cq:WidgetCollection">
-                                    <enable
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="enabletracking"
-                                            fieldDescription="override analytics framework settings."
-                                            fieldLabel="Custom link tracking"
-                                            name="./linkdialog/cq:adhocLinkTrackingEnableTracking"
-                                            xtype="checkbox">
-                                        <listeners
-                                                jcr:primaryType="nt:unstructured"
-                                                check="function(component){var dlg=component.findParentByType('rtelinkdialog');dlg.enableSCFields(component.checked);}"/>
-                                    </enable>
-                                    <events
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="adhocevents"
-                                            fieldDescription="e.g.: event2, event7."
-                                            fieldLabel="Include SiteCatalyst events"
-                                            name="./linkdialog/cq:adhocLinkTrackingEvents"
-                                            xtype="textfield"/>
-                                    <evars
-                                            jcr:primaryType="nt:unstructured"
-                                            attribute="adhocevars"
-                                            fieldDescription="e.g.: eVar1: pagedata.url, prop4: 'const'."
-                                            fieldLabel="Include SiteCatalyst variables"
-                                            name="./linkdialog/cq:adhocLinkTrackingEvars"
-                                            xtype="textfield"/>
-                                </items>
-                            </linkAdvanced>
-                        </linkAttributes>
-                    </linkDialogConfig>
-                </links>
-                <misctools
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <edit
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <findreplace
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <format
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <undo
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <subsuperscript
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <lists
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <justify
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-                <paraformat
-                        jcr:primaryType="nt:unstructured"
-                        features="*"/>
-            </rtePlugins>
-            <uiSettings jcr:primaryType="nt:unstructured">
-                <cui jcr:primaryType="nt:unstructured">
-                    <inline
-                            jcr:primaryType="nt:unstructured"
-                            toolbar="[#format,-,#justify,-,#lists,-,links#modifylink,links#unlink,-,footnoteplugin#footnotecommand,-,fullscreen#start,-,control#close,control#save]">
-                        <popovers jcr:primaryType="nt:unstructured">
-                            <justify
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[justify#justifyleft,justify#justifycenter,justify#justifyright]"
-                                    ref="justify"/>
-                            <lists
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[lists#unordered,lists#ordered,lists#outdent,lists#indent]"
-                                    ref="lists"/>
-                            <format
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[format#bold,format#italic,format#underline]"
-                                    ref="format"/>
-                            <paraformat
-                                    jcr:primaryType="nt:unstructured"
-                                    items="[paraformat:getFormats:paraformat-pulldown]"
-                                    ref="paraformat"/>
-                        </popovers>
-                    </inline>
-                    <fullscreen
-                            jcr:primaryType="nt:unstructured"
-                            toolbar="[format#bold,format#italic,format#underline,subsuperscript#subscript,subsuperscript#superscript,justify#justifyleft,justify#justifycenter,justify#justifyright,lists#unordered,lists#ordered,lists#outdent,lists#indent,undo#undo,undo#redo,edit#cut,edit#copy,edit#paste-default,edit#paste-plaintext,edit#paste-wordhtml,links#modifylink,links#unlink,footnoteplugin#footnotecommand,links#anchor,findreplace#find,findreplace#replace,misctools#specialchars,#paraformat,fullscreen#finish]">
-                        <popovers jcr:primaryType="nt:unstructured">
-                            <paraformat
-                                    jcr:primaryType="nt:unstructured"
-                                    items="paraformat:getFormats:paraformat-pulldown"
-                                    ref="paraformat"/>
-                        </popovers>
-                    </fullscreen>
-                    <additionalClasses jcr:primaryType="nt:unstructured">
-                        <footnotecommand
-                                jcr:primaryType="nt:unstructured"
-                                classes="rte--trigger"
-                                command="footnoteplugin#footnotecommand"/>
-                    </additionalClasses>
-                </cui>
-            </uiSettings>
-        </inplaceEditingConfig>
+                textPropertyName="jcr:title"/>
     </cq:inplaceEditing>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/button.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/button.html
index 80e5376592..67ac6e522b 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/button.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/button.html
@@ -39,7 +39,7 @@
       data-cmp-data-layer="${button.data.json}"
       aria-label="${button.label.visible != false ? '' : button.label.value}">
     <sly data-sly-call="${iconTemplate.icon @ icon=button.icon}"></sly>
-    <span data-sly-test="${button.label.value && button.label.visible != false}" class="cmp-adaptiveform-button__text" data-richtext="${button.label.richText}">${button.label.value @ context = button.label.richText ? 'html' : 'text'}</span>
+    <span data-sly-test="${button.label.value && button.label.visible != false}" class="cmp-adaptiveform-button__text">${button.label.value}</span>
   </button>
   <div data-sly-call="${shortDescription.shortDescription @componentId=button.id, shortDescriptionVisible=button.tooltipVisible, shortDescription=button.tooltip, bemBlock='cmp-adaptiveform-button'}" data-sly-unwrap>
   </div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_dialog/.content.xml
index d3fc371401..f5cfce8fe3 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_dialog/.content.xml
@@ -66,7 +66,7 @@
                                             </type>
                                             <!--<enumOptions jcr:primaryType="nt:unstructured"
                                               sling:hideResource="{Boolean}true" />-->
-                                            <enumsCustom jcr:primaryType="nt:unstructured"
+                                            <enums_123 jcr:primaryType="nt:unstructured"
                                               sling:resourceType="granite/ui/components/coral/foundation/container"
                                               granite:class="cmp-adaptiveform-checkbox__enums">
                                                 <items jcr:primaryType="nt:unstructured">
@@ -81,7 +81,7 @@
                                                   sling:resourceType="granite/ui/components/coral/foundation/form/switch"
                                                   wrapperClass="cmp-adaptiveform-checkbox__enable-unchecked-value"
                                                   name="./enableUncheckedValue"
-                                                  fieldLabel="Preserve Uncheck state value."
+                                                  fieldLabel="Enable Uncheck."
                                                   fieldDescription="Specify the value to be returned when the checkbox is not checked by the user."
                                                   uncheckedValue="false"
                                                   value="true">
@@ -98,7 +98,7 @@
                                                   sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
                                                   name="./uncheckedValue"/>
                                                 </items>
-                                            </enumsCustom>
+                                            </enums_123>
                                             <defaultValue
                                               wrapperClass="cmp-adaptiveform-checkbox__value"
                                               jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/checkbox.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/checkbox.html
index 04ba4401ac..9ff57dad69 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/checkbox.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/checkbox.html
@@ -46,7 +46,7 @@
             value="${checkbox.default[0]}"
             disabled="${!checkbox.enabled || checkbox.readOnly}" />
 
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkbox.label.value, labelVisible=checkbox.label.visible, labelRichText=checkbox.label.richText, bemBlock='cmp-adaptiveform-checkbox'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkbox.label.value, labelVisible=checkbox.label.visible, bemBlock='cmp-adaptiveform-checkbox'}" data-sly-unwrap></div>
     </div>
 
     <div data-sly-call="${shortDescription.shortDescription @componentId=checkbox.id, shortDescriptionVisible=checkbox.tooltipVisible, shortDescription=checkbox.tooltip, bemBlock='cmp-adaptiveform-checkbox'}" data-sly-unwrap>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/clientlibs/site/js/checkboxview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/clientlibs/site/js/checkboxview.js
index fe25cf364e..69446edb57 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/clientlibs/site/js/checkboxview.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/clientlibs/site/js/checkboxview.js
@@ -17,7 +17,7 @@
 
 
     "use strict";
-    class CheckBox extends FormView.FormCheckBox {
+    class CheckBox extends FormView.FormFieldBase {
 
         static NS = FormView.Constants.NS;
         /**
@@ -68,6 +68,34 @@
         getTooltipDiv() {
             return this.element.querySelector(CheckBox.selectors.tooltipDiv);
         }
+
+        setModel(model) {
+            super.setModel(model);
+            this._onValue = this._model._jsonModel.enum[0];
+            this._offValue = this._model._jsonModel.enum[1];
+            this.widget.addEventListener('change', (e) => {
+                if (this.widget.checked) {
+                    this._model.value = this._onValue;
+                } else {
+                    this._model.value = this._offValue;
+                }
+            })
+
+        }
+
+        updateValue(modelValue) {
+            if (modelValue === this._model._jsonModel.enum[0]) {
+                this.widget.checked = true
+                this.widget.setAttribute(FormView.Constants.HTML_ATTRS.CHECKED, FormView.Constants.HTML_ATTRS.CHECKED)
+                this.widget.setAttribute(FormView.Constants.ARIA_CHECKED, true);
+            } else {
+                this.widget.checked = false
+                this.widget.removeAttribute(FormView.Constants.HTML_ATTRS.CHECKED);
+                this.widget.setAttribute(FormView.Constants.ARIA_CHECKED, false);
+            }
+            this.widget.value = modelValue;
+            super.updateEmptyStatus();
+        }
     }
     FormView.Utils.setupField(({element, formContainer}) => {
         return new CheckBox({element, formContainer})
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
index 3c524e065c..5052da0b5b 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
@@ -14,7 +14,6 @@
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
 <sly data-sly-use.renderer="${'checkboxgroup.js'}"
-     data-sly-use.widget="widget.html"
      data-sly-use.clientlib="${'/libs/granite/sightly/templates/clientlib.html'}"
      data-sly-use.label="${renderer.labelPath}"
      data-sly-use.shortDescription="${renderer.shortDescriptionPath}"
@@ -35,10 +34,27 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[checkboxgroup.id, 'widget']}">
     <div class="cmp-adaptiveform-checkboxgroup__label-container">
-        <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkboxgroup.label.value, labelVisible=checkboxgroup.label.visible, labelRichText=checkboxgroup.label.richText, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
-        <div data-sly-call="${questionMark.questionMark @componentId=checkboxgroup.id, longDescription=checkboxgroup.description, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkboxgroup.label.value, labelVisible=checkboxgroup.label.visible, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
+      <div data-sly-call="${questionMark.questionMark @componentId=checkboxgroup.id, longDescription=checkboxgroup.description, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
     </div>
-    <sly data-sly-call="${widget.widget @ checkboxgroup = checkboxgroup}"></sly>
+
+    <div class="cmp-adaptiveform-checkboxgroup__widget ${checkboxgroup.orientation}" id="${widgetId}">
+        <div data-sly-list="${checkboxgroup.enums}" data-sly-unwrap>
+            <div class="cmp-adaptiveform-checkboxgroup-item ${checkboxgroup.name}">
+                <label class="cmp-adaptiveform-checkboxgroup__option-label"
+                       title="${checkboxgroup.tooltipVisible ? '' : checkboxgroup.tooltipText}">
+                    <input class="cmp-adaptiveform-checkboxgroup__option__widget" type="checkbox"
+                           name="${checkboxgroup.name}"
+                           value="${checkboxgroup.enums[itemList.index].toString}"
+                           checked="${checkboxgroup.enums[itemList.index] in checkboxgroup.default }"
+                           disabled="${!checkboxgroup.enabled || checkboxgroup.readOnly}"
+                           aria-readonly="${checkboxgroup.readOnly ? 'true' : ''}"/>
+                    <span>${checkboxgroup.enumNames[itemList.index]}</span>
+                </label>
+            </div>
+        </div>
+    </div>
+
     <div data-sly-call="${shortDescription.shortDescription @componentId=checkboxgroup.id, shortDescriptionVisible=checkboxgroup.tooltipVisible, shortDescription=checkboxgroup.tooltip, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap>
     </div>
     <div data-sly-call="${longDescription.longDescription @componentId=checkboxgroup.id, longDescription=checkboxgroup.description, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html
deleted file mode 100644
index 211de57194..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<template data-sly-template.widget="${ @ checkboxgroup }">
-  <div class="cmp-adaptiveform-checkboxgroup__widget ${checkboxgroup.orientation}" id="${widgetId}">
-    <div data-sly-list="${checkboxgroup.enums}" data-sly-unwrap>
-      <div class="cmp-adaptiveform-checkboxgroup-item ${checkboxgroup.name}">
-        <label class="cmp-adaptiveform-checkboxgroup__option-label"
-               title="${checkboxgroup.tooltipVisible ? '' : checkboxgroup.tooltipText}">
-          <input class="cmp-adaptiveform-checkboxgroup__option__widget" type="checkbox"
-                 name="${checkboxgroup.name}"
-                 value="${checkboxgroup.enums[itemList.index].toString}"
-                 checked="${checkboxgroup.enums[itemList.index] in checkboxgroup.default }"
-                 disabled="${!checkboxgroup.enabled || checkboxgroup.readOnly}"
-                 aria-readonly="${checkboxgroup.readOnly ? 'true' : ''}"/>
-          <span>${checkboxgroup.enumNamesAsTextContent[itemList.index].value @ context = checkboxgroup.enumNamesAsTextContent[itemList.index].richText ? 'html' : 'text'}</span>
-        </label>
-      </div>
-    </div>
-  </div>
-</template>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
index 9469df1e1d..48107dcf8f 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
@@ -20,5 +20,3 @@ componentutils.js
 replacehook.js
 dorhook.js
 copypastehook.js
-toolbaractionhook.js
-qualifiedNameHook.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/qualifiedNameHook.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/qualifiedNameHook.js
deleted file mode 100644
index 58277436e2..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/qualifiedNameHook.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-(function (window, author, Coral) {
-    "use strict";
-
-    /**
-     * Get Qualified name for a component
-     * @param {Object} component The component that has to be instantiated
-     */
-    window.CQ.FormsCoreComponents.editorhooks.viewQualifiedName = function (component) {
-        author.afUtils.getQualifiedName(component).then(function (componentQualifiedName) {
-            const localisedQualifiedNameMessage = CQ.I18n.getMessage('Qualified Name');
-            const localizedWaringMessageForQualifiedName = CQ.I18n.getMessage("A Qualified Name is based on the position of the component. It changes if a component is moved.");
-            const dialog = new Coral.Dialog().set({
-                id: 'getQualifiedNameDialog',
-                header: {
-                    innerHTML: localisedQualifiedNameMessage
-                },
-                content: {
-                    innerHTML: componentQualifiedName + '<br/> <br/>' + "<strong>*</strong>" + localizedWaringMessageForQualifiedName
-                },
-                footer: {},
-                closable: "on"
-            });
-            document.body.appendChild(dialog);
-
-            dialog.show();
-        });
-    };
-
-})(window, Granite.author, Coral);
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/replacehook.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/replacehook.js
index 4abd4e9502..a874dacd33 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/replacehook.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/replacehook.js
@@ -19,7 +19,6 @@
         BINARY: 'binary',
         TEXT: 'text',
         SELECT: 'select',
-        CHECKBOX: 'checkBox',
         LIST: 'list',
         DATE: 'date',
         NON_INPUT: 'nonInputReadOnly',
@@ -28,7 +27,6 @@
     const typeMap = {
         'button': fieldTypes.NON_INPUT,
         'checkbox-group': fieldTypes.SELECT,
-        'checkbox': fieldTypes.CHECKBOX,
         'date-input': fieldTypes.TEXT,
         'drop-down': fieldTypes.SELECT,
         'email': fieldTypes.TEXT,
@@ -46,8 +44,8 @@
     const preservedProperties = ['id', 'description', 'enabled', 'jcr:created', 'jcr:title', 'name',
         'placeholder', 'readOnly', 'required', 'tooltip', 'visible', 'enum', 'enumNames'];
 
-    const cannotBeReplacedWith = ['file-input'],
-        irreplaceable = ['file-input'],
+    const cannotBeReplacedWith = ['file-input', 'checkbox'],
+        irreplaceable = ['file-input', 'checkbox'],
         editableJsonPath = '.model.json',
         componentJsonPath = '.json';
 
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js
deleted file mode 100644
index 9610ad0139..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-(function (ns) {
-    "use strict";
-    let superSitesEditorAppendButton = ns.edit.Toolbar.prototype.appendButton;
-
-    /**
-     * @override
-     */
-    ns.edit.Toolbar.prototype.appendButton = function (editable, name, action) {
-        correctEditableEditorType(editable, name);
-        superSitesEditorAppendButton.apply(this, [editable, name, action]);
-    };
-
-    /**
-     * @override
-     * In case of forms editor we are overriding sites toolbar actions and has a custom toolbar implementation.
-     * Therefore, needs a special handling.
-     */
-    if(window.guidelib){
-        var superFormsEditorAppendButton = window.guidelib.touchlib.editToolbar.prototype.appendButton;
-        window.guidelib.touchlib.editToolbar.prototype.appendButton = function (editable, name, action) {
-            //adding this check because we don't want to change editorType for v1 forms.
-            if(window.guidelib.touchlib.utils.checkIfCoreComponentsBasedForm()){
-                correctEditableEditorType(editable, name);
-            }
-            superFormsEditorAppendButton.apply(this, [editable, name, action]);
-        };
-    };
-
-    const correctEditableEditorType = function (editable, name) {
-        if (name == "EDIT") {
-            var hasRichTextLabel = editable.dom.find("[class$='__label']")[0] && editable.dom.find("[class$='__label']")[0].getAttribute("data-richtext") != null,
-                hasRichTextAttribute = editable.dom.find("[class$='__text']")[0] && editable.dom.find("[class$='__text']")[0].getAttribute("data-richtext") != null;
-            // We are checking for data-richtext in component to decide whether open rich-text inplace editor or plain text editor
-            if(!(hasRichTextLabel || hasRichTextAttribute)){
-                editable.config.editConfig.inplaceEditingConfig.editorType="plaintext";
-            }
-        }
-    };
-
-}(Granite.author));
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/datepicker.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/datepicker.html
index d376a6a6e4..6832ade1f0 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/datepicker.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/datepicker.html
@@ -32,7 +32,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[datePicker.id, 'widget']}">
      <div class="cmp-adaptiveform-datepicker__label-container">
-        <div data-sly-call="${label.label @componentId=widgetId, labelValue=datePicker.label.value, labelVisible=datePicker.label.visible, labelRichText=datePicker.label.richText, bemBlock='cmp-adaptiveform-datepicker'}" data-sly-unwrap></div>
+        <div data-sly-call="${label.label @componentId=widgetId, labelValue=datePicker.label.value, labelVisible=datePicker.label.visible, bemBlock='cmp-adaptiveform-datepicker'}" data-sly-unwrap></div>
         <div data-sly-call="${questionMark.questionMark @componentId=datePicker.id, longDescription=datePicker.description, bemBlock='cmp-adaptiveform-datepicker'}" data-sly-unwrap></div>
      </div>
      <input type="date"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_dialog/.content.xml
index b641f450df..d9a5236366 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_dialog/.content.xml
@@ -69,53 +69,10 @@
                                                     sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
                                                     name="./type"/>
                                             <enums jcr:primaryType="nt:unstructured"
-                                                   sling:resourceType="granite/ui/components/coral/foundation/container"
-                                                   sling:orderBefore="bindref">
-                                                <items jcr:primaryType="nt:unstructured">
-                                                    <enumOptions jcr:primaryType="nt:unstructured"
-                                                                 sling:orderBefore="bindref"
-                                                                 sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                                                                 fieldDescription="Provide the pair of enum (data value) and enumName (display text) for each option."
-                                                                 fieldLabel="Options">
-                                                        <field jcr:primaryType="nt:unstructured"
-                                                               sling:resourceType="granite/ui/components/coral/foundation/container"
-                                                               name="./enum">
-                                                            <items jcr:primaryType="nt:unstructured">
-                                                                <enum jcr:primaryType="nt:unstructured"
-                                                                      sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                                      granite:class="cmp-adaptiveform-base__enum"
-                                                                      name="./enum"
-                                                                      fieldLabel="Data value"
-                                                                      fieldDescription="Specify the content to submit, when the option is selected."
-                                                                      required="{Boolean}true"/>
-                                                                <enumNames
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                                        granite:class="cmp-adaptiveform-base__enumNames"
-                                                                        name="./enumNames"
-                                                                        fieldLabel="Display text"
-                                                                        fieldDescription="Specify the content to display in the adaptive form."
-                                                                        required="{Boolean}false"/>
-                                                                <richTextEnumNames
-                                                                        jcr:primaryType="nt:unstructured"
-                                                                        sling:hideResource="{Boolean}true"/>
-                                                            </items>
-                                                        </field>
-                                                    </enumOptions>
-                                                    <enumNames jcr:primaryType="nt:unstructured"
-                                                               sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                                                               granite:hidden="true">
-                                                        <field jcr:primaryType="nt:unstructured"
-                                                               sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                               name="./enumNames"
-                                                               granite:class="cmp-adaptiveform-base__enumNamesHidden"
-                                                               granite:hidden="true"/>
-                                                    </enumNames>
-                                                    <areOptionsRichText
-                                                            jcr:primaryType="nt:unstructured"
-                                                            sling:hideResource="true"/>
-                                                </items>
-                                            </enums>
+                                                   sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                   path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/enums"
+                                                   sling:orderBefore="placeholder"
+                                                   sling:hideResource="{Boolean}false"/>
                                             <multiSelect
                                                     granite:class="cmp-adaptiveform-dropdown__allowmultiselect"
                                                     jcr:primaryType="nt:unstructured"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/dropdown.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/dropdown.html
index b9b5255483..399af2569e 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/dropdown.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/dropdown.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[dropdown.id, 'widget']}">
     <div class="cmp-adaptiveform-dropdown__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=dropdown.label.value, labelVisible=dropdown.label.visible, labelRichText=dropdown.label.richText, bemBlock='cmp-adaptiveform-dropdown'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=dropdown.label.value, labelVisible=dropdown.label.visible, bemBlock='cmp-adaptiveform-dropdown'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=dropdown.id, longDescription=dropdown.description, bemBlock='cmp-adaptiveform-dropdown'}" data-sly-unwrap></div>
     </div>
     <select class="cmp-adaptiveform-dropdown__widget"
@@ -48,11 +48,11 @@
         <div data-sly-test.isPlaceHolderSet="${dropdown.placeHolder != null}" data-sly-unwrap></div>
         <option data-sly-test="${!isPlaceHolderSet}" role="none" style="display: none;"></option>
         <option data-sly-test="${isPlaceHolderSet}" value="" disabled selected>${dropdown.placeHolder}</option>
-        <div data-sly-list.enumName="${dropdown.enumNamesAsTextContent}" data-sly-unwrap>
-            <div data-sly-test="${dropdown.enums[enumNameList.index] != null}" data-sly-unwrap>
+        <div data-sly-list.enumName="${dropdown.enumNames}" data-sly-unwrap>
+            <div data-sly-test="${enumName != null && dropdown.enums[enumNameList.index] != null}" data-sly-unwrap>
                 <option value="${dropdown.enums[enumNameList.index].toString}"
                         class="cmp-adaptiveform-dropdown__option"
-                        data-sly-attribute.selected="${dropdown.enums[enumNameList.index] in dropdown.default ? 'selected' : ''}">${enumName.value}</option>
+                        data-sly-attribute.selected="${dropdown.enums[enumNameList.index] in dropdown.default ? 'selected' : ''}">${enumName}</option>
             </div>
         </div>
     </select>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/emailinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/emailinput.html
index acca041b12..0219f8c4c1 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/emailinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/emailinput.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[email.id, 'widget']}">
     <div class="cmp-adaptiveform-emailinput__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=email.label.value, labelVisible=email.label.visible, labelRichText=email.label.richText, bemBlock='cmp-adaptiveform-emailinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=email.label.value, labelVisible=email.label.visible, bemBlock='cmp-adaptiveform-emailinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=email.id, longDescription=email.description, bemBlock='cmp-adaptiveform-emailinput'}" data-sly-unwrap></div>
     </div>
     <input title="${email.tooltipVisible ? '' : email.tooltipText}"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput/fileinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput/fileinput.html
index 9b3ca83c3c..eed8c9de6b 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput/fileinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput/fileinput.html
@@ -31,7 +31,7 @@
      data-cmp-readonly="${file.readOnly ? 'true' : 'false'}"
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}">
     <div class="cmp-adaptiveform-fileinput__label-container">
-      <div data-sly-call="${label.label @componentId=file.id, labelValue=file.label.value, labelVisible=file.label.visible, labelRichText=file.label.richText, bemBlock='cmp-adaptiveform-fileinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=file.id, labelValue=file.label.value, labelVisible=file.label.visible, bemBlock='cmp-adaptiveform-fileinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=file.id, longDescription=file.description, bemBlock='cmp-adaptiveform-fileinput'}" data-sly-unwrap></div>
     </div>
     </br>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
index c9e7a3e558..bddc2ac056 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
@@ -32,12 +32,6 @@
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/container">
                                         <items jcr:primaryType="nt:unstructured">
-                                            <richTextTitle
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:hideResource="true"/>
-                                            <isTitleRichText
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:hideResource="true"/>
                                             <hideTitle
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:hideResource="true"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_editConfig.xml
index 944f35aecb..0a2082c707 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_editConfig.xml
@@ -26,10 +26,5 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
 </jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/numberinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/numberinput.html
index 09dd5ee699..74336728d9 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/numberinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/numberinput.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[numberinput.id, 'widget']}">
     <div class="cmp-adaptiveform-numberinput__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=numberinput.label.value, labelVisible=numberinput.label.visible, labelRichText=numberinput.label.richText, bemBlock='cmp-adaptiveform-numberinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=numberinput.label.value, labelVisible=numberinput.label.visible, bemBlock='cmp-adaptiveform-numberinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=numberinput.id, longDescription=numberinput.description, bemBlock='cmp-adaptiveform-numberinput'}" data-sly-unwrap></div>
     </div>
     <input
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
index 6dbbf022db..90177bda0c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
@@ -56,14 +56,6 @@
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/include"
                                                     path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
-                                            <richTextTitle
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/richTextTitle"/>
-                                            <isTitleRichText
-                                                    jcr:primaryType="nt:unstructured"
-                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
-                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/isTitleRichText"/>
                                             <hideTitle
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/include"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml
index 153885652d..5eb7044978 100755
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml
@@ -20,10 +20,5 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
 </jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/responsiveGrid.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/responsiveGrid.html
index 022b328ec6..88dcec3492 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/responsiveGrid.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/responsiveGrid.html
@@ -24,7 +24,7 @@
          role="${container.roleAttribute}"
          style="${container.backgroundStyle @ context='styleString'}">
         <div class="cmp-container__label-container">
-          <div data-sly-call="${label.label @componentId=panel.id, labelValue=panel.label.value, labelVisible=panel.label.visible, labelRichText=panel.label.richText, bemBlock='cmp-container'}" data-sly-unwrap></div>
+          <div data-sly-call="${label.label @componentId=panel.id, labelValue=panel.label.value, labelVisible=panel.label.visible, bemBlock='cmp-container'}" data-sly-unwrap></div>
           <div data-sly-call="${questionMark.questionMark @componentId=panel.id, longDescription=panel.description, bemBlock='cmp-container'}" data-sly-unwrap></div>
         </div>
         <div data-sly-call="${shortDescription.shortDescription @componentId=panel.id, shortDescriptionVisible=panel.tooltipVisible, shortDescription=panel.tooltip, bemBlock='cmp-container'}" data-sly-unwrap></div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/simple.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/simple.html
index 66a5c455ad..0706fda01e 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/simple.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/simple.html
@@ -26,7 +26,7 @@
          role="${container.roleAttribute}"
          style="${container.backgroundStyle @ context='styleString'}">
         <div class="cmp-container__label-container">
-          <div data-sly-call="${label.label @componentId=panel.id, labelValue=panel.label.value, labelVisible=panel.label.visible, labelRichText=panel.label.richText, bemBlock='cmp-container'}" data-sly-unwrap></div>
+          <div data-sly-call="${label.label @componentId=panel.id, labelValue=panel.label.value, labelVisible=panel.label.visible, bemBlock='cmp-container'}" data-sly-unwrap></div>
           <div data-sly-call="${questionMark.questionMark @componentId=panel.id, longDescription=panel.description, bemBlock='cmp-container'}" data-sly-unwrap></div>
         </div>
         <div data-sly-call="${shortDescription.shortDescription @componentId=panel.id, shortDescriptionVisible=panel.tooltipVisible, shortDescription=panel.tooltip, bemBlock='cmp-container'}" data-sly-unwrap></div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
index a6eab594a4..539bb16a29 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
@@ -34,7 +34,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[radioButton.id, 'widget']}">
     <div class="cmp-adaptiveform-radiobutton__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=radioButton.label.value, labelVisible=radioButton.label.visible, labelRichText=radioButton.label.richText, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=radioButton.label.value, labelVisible=radioButton.label.visible, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=radiobutton.id, longDescription=radioButton.description, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
     </div>
     <div class="cmp-adaptiveform-radiobutton__widget ${radioButton.orientation}" id="${widgetId}">
@@ -49,7 +49,7 @@
                         disabled="${!radioButton.enabled || radioButton.readOnly}"
                         checked="${radioButton.enums[itemList.index] == radioButton.default[0]}"
                         aria-readonly="${radioButton.readOnly ? 'true' : ''}"/>
-                  <span>${radioButton.enumNamesAsTextContent[itemList.index].value @ context = radioButton.enumNamesAsTextContent[itemList.index].richText ? 'html' : 'text'}</span>
+                  <span>${radioButton.enumNames[itemList.index]}</span>
               </label>
           </div>
       </div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_editConfig.xml
index 5fbe36bd27..3ec7d0c240 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_editConfig.xml
@@ -12,11 +12,6 @@
                 order="after CONFIGURE"
                 icon="bidRule"
                 text="Edit Rules"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
     <cq:inplaceEditing
             jcr:primaryType="cq:InplaceEditingConfig"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/.content.xml
deleted file mode 100644
index 0f124317e0..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/.content.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/.content.xml
deleted file mode 100644
index 9ffb2b155a..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/.content.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-          jcr:primaryType="nt:unstructured">
-</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/.content.xml
deleted file mode 100644
index b6aeaa9684..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/.content.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:description="Add a field to capture numeric input"
-    jcr:primaryType="cq:Component"
-    jcr:title="Adaptive Form Switch (v1)"
-    sling:resourceSuperType="core/fd/components/form/checkbox/v1/checkbox"
-    componentGroup=".core-adaptiveform"/>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/README.md
deleted file mode 100644
index 87ce7d64a4..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-Copyright 2023 Adobe
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-Adaptive Form Switch (v1)
-====
-Adaptive Form Switch component written in HTL.
-
-## Features
-
-* Provides the following type of input:
-  * switch
-* Custom constraint messages for the above types
-* Styles
-
-### Use Object
-The Form switch component uses the `com.adobe.cq.forms.core.components.models.form.Switch` extends `com.adobe.cq.forms.core.components.models.form.CheckBox` Sling Model for its Use-object.
-
-### Edit Dialog Properties
-The following properties are written to JCR for this Form Switch component and are expected to be available as `Resource` properties:
-
-1. `./jcr:title` - defines the label to use for this field
-2. `./hideTitle` - if set to `true`, the label of this field will be hidden
-3. `./name` - defines the name of the field, which will be submitted with the form data
-4. `./description` - defines a help message that can be rendered in the field as a hint for the user
-5. `./readOnly` - if set to `true`, the filed will be read only
-6. `./type` - defines the data type of the value
-7. `./enum` - defines the two set of possible values for this field. (On or Off)
-
-## Enum
-Switch component can have only one of two state i.e. ON and OFF. Since the enums are stored as array, the enum at index '0' is assumed to be OFF(i.e. switch is 'off'), and enum at index '1' is ON (i.e. switch is 'on'')
-
-## Client Libraries
-The component provides a `core.forms.components.switch.v1.runtime` client library category that contains the Javascript runtime for the component. 
-It should be added to a relevant site client library using the `embed` property.
-
-It also provides a `core.forms.components.switch.v1.editor` editor client library category that includes
-JavaScript handling for dialog interaction. It is already included by its edit dialog.
-
-## BEM Description
-```
-BLOCK cmp-adaptiveform-switch
-    ELEMENT cmp-adaptiveform-switch__label-container
-    ELEMENT cmp-adaptiveform-switch__container
-    ELEMENT cmp-adaptiveform-switch__option
-    ELEMENT cmp-adaptiveform-switch__option--off
-    ELEMENT cmp-adaptiveform-switch__option--on
-    ELEMENT cmp-adaptiveform-switch__widget
-    ELEMENT cmp-adaptiveform-switch__widget-label
-    ELEMENT cmp-adaptiveform-switch__widget-slider
-    ELEMENT cmp-adaptiveform-switch__circle-indicator
-    ELEMENT cmp-adaptiveform-switch__hide-labels
-    ELEMENT cmp-adaptiveform-switch__unhide-labels
-    ELEMENT cmp-adaptiveform-switch__questionmark
-    ELEMENT cmp-adaptiveform-switch__shortdescription
-    ELEMENT cmp-adaptiveform-switch__longdescription
-    ELEMENT cmp-adaptiveform-switch__errormessage
-```
-
-## JavaScript Data Attribute Bindings
-
-The following attributes must be added for the initialization of the switch component in the form view:  
- 1. `data-cmp-is="adaptiveFormSwitch"`
- 2. `data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"`
-
- 
-## Information
-* **Vendor**: Adobe
-* **Version**: v1
-* **Compatibility**: Cloud
-* **Status**: production-ready
-
-
-
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_dialog/.content.xml
deleted file mode 100644
index 30ffb1e76d..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_dialog/.content.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
-          xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-          jcr:primaryType="nt:unstructured"
-          jcr:title="Adaptive Form Switch"
-          sling:resourceType="cq/gui/components/authoring/dialog"
-          extraClientlibs="[core.forms.components.switch.v1.editor]"
-          helpPath="https://www.adobe.com/go/aem_af_cmp_switch_v1"
-          trackingFeature="core-components:adaptiveform-switch:v1">
-    <content jcr:primaryType="nt:unstructured"
-             granite:class="cmp-adaptiveform-switch__editdialog"
-             sling:resourceType="granite/ui/components/coral/foundation/container">
-        <items jcr:primaryType="nt:unstructured">
-            <tabs jcr:primaryType="nt:unstructured"
-                  sling:resourceType="granite/ui/components/coral/foundation/tabs"
-                  maximized="{Boolean}true">
-                <items jcr:primaryType="nt:unstructured">
-                    <basic jcr:primaryType="nt:unstructured"
-                           jcr:title="Basic"
-                           sling:resourceType="granite/ui/components/coral/foundation/container"
-                           active="{Boolean}true"
-                           selected="{Boolean}true">
-                        <items jcr:primaryType="nt:unstructured">
-                            <columns
-                                    jcr:primaryType="nt:unstructured"
-                                    sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
-                                    margin="{Boolean}true">
-                                <items jcr:primaryType="nt:unstructured">
-                                    <column
-                                            jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/coral/foundation/container">
-                                        <items jcr:primaryType="nt:unstructured">
-                                            <enums jcr:primaryType="nt:unstructured"
-                                                   sling:orderBefore="bindref"
-                                                   sling:resourceType="granite/ui/components/coral/foundation/container">
-                                                <items jcr:primaryType="nt:unstructured">
-                                                    <enumOptions jcr:primaryType="nt:unstructured"
-                                                                 sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                                                                 wrapperClass="cmp-adaptiveform-switch__enums"
-                                                                 fieldDescription="Provide switch state data and display text for each option."
-                                                                 fieldLabel="Options">
-                                                    </enumOptions>
-                                                </items>
-                                            </enums>
-                                            <type jcr:primaryType="nt:unstructured"
-                                                  sling:orderBefore="visible"
-                                                  sling:resourceType="granite/ui/components/coral/foundation/form/select"
-                                                  granite:class="cmp-adaptiveform-switch__type"
-                                                  fieldLabel="Data type of submitted value"
-                                                  required="{Boolean}true"
-                                                  name="./type"
-                                                  key="String"
-                                                  value="string">
-                                                <items jcr:primaryType="nt:unstructured">
-                                                    <string jcr:primaryType="nt:unstructured" text="String" value="string"/>
-                                                    <boolean jcr:primaryType="nt:unstructured" text="Boolean" value="boolean"/>
-                                                    <number jcr:primaryType="nt:unstructured" text="Number" value="number"/>
-                                                </items>
-                                            </type>
-                                            <enumsCustom jcr:primaryType="nt:unstructured"
-                                                       sling:orderBefore="enums"
-                                                       sling:resourceType="granite/ui/components/coral/foundation/container"
-                                                       granite:class="cmp-adaptiveform-switch__enums">
-                                                <items jcr:primaryType="nt:unstructured">
-                                                    <checkedValue
-                                                            jcr:primaryType="nt:unstructured"
-                                                            sling:hideResource="{Boolean}true"
-                                                            name="./checkedValue"/>
-                                                    <enableUncheckedValue
-                                                            jcr:primaryType="nt:unstructured"
-                                                            sling:resourceType="granite/ui/components/coral/foundation/form/switch"
-                                                            wrapperClass="cmp-adaptiveform-switch__enable--unchecked--value"
-                                                            name="./enableUncheckedValue"
-                                                            fieldLabel="Preserve Uncheck state value."
-                                                            fieldDescription="Specify the value to be returned when the switch is not on by the user."
-                                                            uncheckedValue="false"
-                                                            value="true">
-                                                    </enableUncheckedValue>
-                                                    <unCheckedValue
-                                                            sling:hideResource="{Boolean}true"
-                                                            jcr:primaryType="nt:unstructured"
-                                                            name="./uncheckedValue"/>
-                                                </items>
-                                            </enumsCustom>
-                                        </items>
-                                    </column>
-                                </items>
-                            </columns>
-                        </items>
-                    </basic>
-                </items>
-            </tabs>
-        </items>
-    </content>
-</jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_template.xml
deleted file mode 100644
index f0fea73ceb..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_template.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
-          jcr:primaryType="nt:unstructured"
-          jcr:title="Switch"
-          fieldType="checkbox"
-          enum="[1,0]"
-          enumNames="[ON,OFF]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/.content.xml
deleted file mode 100644
index 491392d539..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/.content.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/.content.xml
deleted file mode 100644
index cb95a62983..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/.content.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="cq:ClientLibraryFolder"
-    categories="[core.forms.components.switch.v1.editor]"
-    dependencies="[core.forms.components.base.v1.editor, core.forms.components.commons.v1.editor.utils]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/css.txt
deleted file mode 100644
index b3c0d26144..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/css.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright 2023 Adobe
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-
-#base=css
-switcheditor.css
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/css/switcheditor.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/css/switcheditor.css
deleted file mode 100644
index 4c35184b77..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/css/switcheditor.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.cmp-adaptiveform-switch__enums button {
-    display: none;
-}
-.cmp-adaptiveform-switch__enums coral-multifield-item {
-    padding-right: 0px;
-}
-.coral-Form-fieldwrapper .cmp-adaptiveform-switch__enable--unchecked--value {
-    display:flex;
-    margin-bottom:1px;
-    width:40px;
-}
-
-.cmp-adaptiveform-switch__enable--unchecked--value .coral-Form-fieldlabel {
-    padding-right: 20px;
-}
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/js.txt
deleted file mode 100644
index 83b3a1eae4..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/js.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright 2023 Adobe
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-
-#base=js
-editDialog.js
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/js/editDialog.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/js/editDialog.js
deleted file mode 100644
index 21a7beadd2..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/editor/js/editDialog.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-(function($) {
-  "use strict";
-
-  const EDIT_DIALOG = ".cmp-adaptiveform-switch__editdialog",
-      ENABLE_UNCHECKED_VALUE = EDIT_DIALOG + " .cmp-adaptiveform-switch__enable--unchecked--value coral-switch",
-      ENUM_OPTION = ".cmp-adaptiveform-switch__enums coral-multifield-item",
-      SWITCH_TYPE = EDIT_DIALOG + " .cmp-adaptiveform-switch__type",
-      SWITCH_DEFAULTVALUE = EDIT_DIALOG + " .cmp-adaptiveform-switch__value",
-      SWITCH_ENUM = EDIT_DIALOG + " .cmp-adaptiveform-base__enum",
-      Utils = window.CQ.FormsCoreComponents.Utils.v1;
-
-  var registerDialogValidator = Utils.registerDialogDataTypeValidators(
-      SWITCH_DEFAULTVALUE,
-      SWITCH_ENUM,
-      function (dialog) {
-        var selectedValue = '';
-        var switchSaveValue = dialog.find(SWITCH_TYPE);
-        if (switchSaveValue && switchSaveValue.length > 0) {
-          selectedValue = switchSaveValue[0].selectedItem ? switchSaveValue[0].selectedItem.value : '';
-        }
-        return selectedValue.toLowerCase();
-      }
-  );
-
-  /**
-   * The off value of a switch is optional, if not defined then no value will be submitted when the switch is not selected.
-   * To explicitly send the off value, user needs to switch the 'enableUncheckedValue' on.
-   * @param dialog
-   */
-  function handleOffFieldVisibility(dialog) {
-    const enableOffValueSwitch = $(ENABLE_UNCHECKED_VALUE)[0];
-    let isChecked = enableOffValueSwitch.hasAttribute('checked');
-    const offField = $($(ENUM_OPTION)[1]);
-
-    offField.css({"display": isChecked ? "block" : "none"})
-    enableOffValueSwitch.addEventListener("click", function() {
-      isChecked = !isChecked;
-      offField.css({"display": isChecked ? "block" : "none"})
-    })
-  }
-
-    /**
-     * The data value and display text for multifield is same for ON and OFF fields
-     * It sets the specific field labels for the ON and OFF data text and display text
-     * @param dialog
-     */
-    function setDataAndDisplayTextFieldLabel(dialog) {
-        // For every multifield item, we have enum, enumName and richTextEnumName
-        let onDataValueLabel = $($(ENUM_OPTION + ' label'))[0],
-            onDisplayTextLabel = $($(ENUM_OPTION + ' label'))[1],
-            offDataValueLabel = $($(ENUM_OPTION + ' label'))[3],
-            offDisplayTextLabel = $($(ENUM_OPTION + ' label'))[4];
-        onDataValueLabel.innerHTML = 'ON Data Value *';
-        onDisplayTextLabel.innerHTML = 'ON Display text *';
-        offDataValueLabel.innerHTML = 'OFF Data Value *';
-        offDisplayTextLabel.innerHTML = 'OFF Display text *';
-    }
-
-  Utils.initializeEditDialog(EDIT_DIALOG)(handleOffFieldVisibility, registerDialogValidator, setDataAndDisplayTextFieldLabel);
-
-})(jQuery);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/.content.xml
deleted file mode 100644
index 538d4bcd59..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/.content.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="cq:ClientLibraryFolder"
-    categories="[core.forms.components.switch.v1.runtime]"
-    dependencies="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/css.txt
deleted file mode 100644
index 8d36f8ad49..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/css.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright 2023 Adobe
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-
-#base=css
-switchview.css
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/css/switchview.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/css/switchview.css
deleted file mode 100644
index a9aa3d8130..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/css/switchview.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.cmp-adaptiveform-switch {
-}
-
-.cmp-adaptiveform-switch__widget-label {
-}
-
-.cmp-adaptiveform-switch__label-container {
-}
-
-.cmp-adaptiveform-switch__container {
-}
-
-.cmp-adaptiveform-switch__widget {
-}
-
-.cmp-adaptiveform-switch__widget-slider {
-}
-
-.cmp-adaptiveform-switch__widget-slider:before {
-}
-
-input:checked + .cmp-adaptiveform-switch__widget-slider {
-}
-
-input:focus + .cmp-adaptiveform-switch__widget-slider {
-}
-
-input:checked + .cmp-adaptiveform-switch__widget-slider:before {
-}
-
-.cmp-adaptiveform-switch__widget-slider:before {
-}
-
-.cmp-adaptiveform-switch__longdescription {
-}
-
-.cmp-adaptiveform-switch__questionmark {
-}
-
-.cmp-adaptiveform-switch__errormessage {
-}
-
-.cmp-adaptiveform-switch__help-container .cmp-adaptiveform-switch__questionmark {
-}
-
-.cmp-adaptiveform-switch__circle-indicator {
-}
-
-.cmp-adaptiveform-switch__shortdescription {
-}
-.cmp-adaptiveform-switch__option {
-}
-.cmp-adaptiveform-switch__hide-labels .cmp-adaptiveform-switch__option--on {
-}
-.cmp-adaptiveform-switch__hide-labels .cmp-adaptiveform-switch__option--off {
-}
-.cmp-adaptiveform-switch__unhide-labels .cmp-adaptiveform-switch__option--on {
-}
-.cmp-adaptiveform-switch__unhide-labels .cmp-adaptiveform-switch__option--off {
-}
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/js.txt
deleted file mode 100644
index fdc39ed5f7..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/js.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright 2023 Adobe
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-
-#base=js
-switchview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/js/switchview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/js/switchview.js
deleted file mode 100644
index d7596b29ce..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/clientlibs/site/js/switchview.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-(function() {
-
-    "use strict";
-    class Switch extends FormView.FormCheckBox {
-
-        static NS = FormView.Constants.NS;
-        static IS = "adaptiveFormSwitch";
-        static bemBlock = 'cmp-adaptiveform-switch';
-        static selectors  = {
-            self: "[data-" + this.NS + '-is="' + this.IS + '"]',
-            widget: `.${Switch.bemBlock}__widget`,
-            label: `.${Switch.bemBlock}__label`,
-            description: `.${Switch.bemBlock}__longdescription`,
-            errorDiv: `.${Switch.bemBlock}__errormessage`,
-            qm: `.${Switch.bemBlock}__questionmark`,
-            tooltipDiv: `.${Switch.bemBlock}__shortdescription`
-        };
-
-        constructor(params) {
-            super(params);
-        }
-
-        getClass() {
-            return Switch.IS;
-        }
-
-        getWidget() {
-            return this.element.querySelector(Switch.selectors.widget);
-        }
-
-        getDescription() {
-            return this.element.querySelector(Switch.selectors.description);
-        }
-
-        getLabel() {
-            return this.element.querySelector(Switch.selectors.label);
-        }
-
-        getErrorDiv() {
-            return this.element.querySelector(Switch.selectors.errorDiv);
-        }
-
-        getTooltipDiv() {
-            return this.element.querySelector(Switch.selectors.tooltipDiv);
-        }
-
-        getQuestionMarkDiv() {
-            return this.element.querySelector(Switch.selectors.qm);
-        }
-    }
-
-    FormView.Utils.setupField(({element, formContainer}) => {
-        return new Switch({element,formContainer})
-    }, Switch.selectors.self);
-})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/switch.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/switch.html
deleted file mode 100644
index e64d6b31b1..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/switch.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<sly data-sly-use.renderer="${'switch.js'}"
-     data-sly-use.clientlib="${'/libs/granite/sightly/templates/clientlib.html'}"
-     data-sly-use.label="${renderer.labelPath}"
-     data-sly-use.shortDescription="${renderer.shortDescriptionPath}"
-     data-sly-use.longDescription="${renderer.longDescriptionPath}"
-     data-sly-use.errorMessage="${renderer.errorMessagePath}"
-     data-sly-use.questionMark="${renderer.questionMarkPath}"></sly>
-
-<div data-sly-use.switch="com.adobe.cq.forms.core.components.models.form.Switch"
-     class="cmp-adaptiveform-switch"
-     data-cmp-is="adaptiveFormSwitch"
-     id="${switch.id}"
-     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
-     data-cmp-visible="${switch.visible ? 'true' : 'false'}"
-     data-cmp-enabled="${switch.enabled ? 'true' : 'false'}"
-     data-cmp-required="${switch.required ? 'true' : 'false'}"
-     data-cmp-data-layer="${switch.data.json}"
-     data-sly-test.widgetId="${'{0}-{1}' @ format=[switch.id, '_widget']}"
-     data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}">
-    <div class="cmp-adaptiveform-switch__label-container">
-        <div data-sly-call="${label.label @componentId=widgetId, labelValue=switch.label.value, labelVisible=switch.label.visible, bemBlock='cmp-adaptiveform-switch'}" data-sly-unwrap></div>
-        <div data-sly-call="${questionMark.questionMark @componentId=switch.id, longDescription=switch.description, bemBlock='cmp-adaptiveform-switch'}" data-sly-unwrap></div>
-    </div>
-
-    <div class="cmp-adaptiveform-switch__container" id="${widgetId}">
-        <div class="cmp-adaptiveform-switch__option cmp-adaptiveform-switch__option--off"
-        aria-label="${switch.enumNames[1]? switch.enumNames[1] : ''}">${switch.enumNames[1]? switch.enumNames[1] : ''}</div>
-        <label class="cmp-adaptiveform-switch__widget-label">
-            <input class="cmp-adaptiveform-switch__widget"
-                   name="${switch.name}"
-                   type="checkbox"
-                   role="switch"
-                   aria-label="${switch.label.value}"
-                   disabled="${!switch.enabled || switch.readOnly}"
-                   value="${switch.default}"
-                   aria-readonly="${switch.readOnly ? 'true' : ''}">
-            <div class="cmp-adaptiveform-switch__widget-slider">
-                <div class="cmp-adaptiveform-switch__circle-indicator"></div>
-            </div>
-        </label>
-        <div class="cmp-adaptiveform-switch__option cmp-adaptiveform-switch__option--on"
-        aria-label="${switch.enumNames[0]}">${switch.enumNames[0]}</div>
-    </div>
-
-    <div data-sly-call="${shortDescription.shortDescription @componentId=switch.id, shortDescriptionVisible=switch.tooltipVisible, shortDescription=switch.tooltip, bemBlock='cmp-adaptiveform-switch'}" data-sly-unwrap>
-    </div>
-    <div data-sly-call="${longDescription.longDescription @componentId=switch.id, longDescription=switch.description, bemBlock='cmp-adaptiveform-switch'}" data-sly-unwrap></div>
-    <div data-sly-call="${errorMessage.errorMessage @componentId=switch.id, bemBlock='cmp-adaptiveform-switch'}" data-sly-unwrap></div>
-</div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/switch.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/switch.js
deleted file mode 100644
index e9d48689d0..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/switch.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-use(function () {
-
-    var clientlibsArr = ['core.forms.components.base.v1.editor'];
-    var labelPath = 'core/fd/components/af-commons/v1/fieldTemplates/label.html';
-    var shortDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/shortDescription.html";
-    var longDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/longDescription.html";
-    var questionMarkPath = "core/fd/components/af-commons/v1/fieldTemplates/questionMark.html";
-    var errorMessagePath = "core/fd/components/af-commons/v1/fieldTemplates/errorMessage.html";
-    return {
-        labelPath: labelPath,
-        shortDescriptionPath: shortDescriptionPath,
-        longDescriptionPath: longDescriptionPath,
-        questionMarkPath: questionMarkPath,
-        errorMessagePath: errorMessagePath,
-        clientlibs: clientlibsArr
-    }
-});
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_editConfig.xml
index b19be7cb93..98e5132b16 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_editConfig.xml
@@ -37,10 +37,5 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
 </jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/tabsontop.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/tabsontop.html
index 59324d659e..16c732cd08 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/tabsontop.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/tabsontop.html
@@ -29,7 +29,7 @@
   data-placeholder-text="${wcmmode.edit && 'Please drag Tab components here' @ i18n}"
   data-sly-test.widgetId="${'{0}-{1}' @ format=[panel.id, 'widget']}">
      <div class="cmp-tabs__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=panel.label.value, labelVisible=panel.label.visible, labelRichText=panel.label.richText, bemBlock='cmp-tabs'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=panel.label.value, labelVisible=panel.label.visible, bemBlock='cmp-tabs'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=panel.id, longDescription=panel.description, bemBlock='cmp-tabs'}" data-sly-unwrap></div>
      </div>
      <div data-sly-call="${shortDescription.shortDescription @componentId=panel.id, shortDescriptionVisible=panel.tooltipVisible, shortDescription=panel.tooltip, bemBlock='cmp-tabs'}" data-sly-unwrap></div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/telephoneinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/telephoneinput.html
index 995e7ce22e..3bd287dc45 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/telephoneinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/telephoneinput.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[telText.id, 'widget']}">
     <div class="cmp-adaptiveform-telephoneinput__label-container">
-      <div data-sly-call="${label.label @componentId=widgetIdd, labelValue=telText.label.value, labelVisible=telText.label.visible, labelRichText=telText.label.richText, bemBlock='cmp-adaptiveform-telephoneinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetIdd, labelValue=telText.label.value, labelVisible=telText.label.visible, bemBlock='cmp-adaptiveform-telephoneinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=telText.id, longDescription=telText.description, bemBlock='cmp-adaptiveform-telephoneinput'}" data-sly-unwrap></div>
     </div>
     <input title="${telText.tooltipVisible ? '' : telText.tooltipText}"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/.content.xml
deleted file mode 100644
index 491392d539..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/.content.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/.content.xml
deleted file mode 100644
index 5e25fbe65e..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/.content.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:unstructured">
-</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/.content.xml
deleted file mode 100644
index b18110bf47..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/.content.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2022 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    cq:icon="article"
-    cq:isContainer="{Boolean}true"
-    jcr:description="Terms and Conditions"
-    jcr:primaryType="cq:Component"
-    jcr:title="Terms and Conditions (v1)"
-    sling:resourceSuperType="wcm/foundation/components/responsivegrid"
-    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/README.md
deleted file mode 100644
index 94fee3b1f4..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-Copyright 2023 Adobe
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-Adaptive Form Terms and Conditions (v1)
-====
-Adaptive Form Terms and Components field component written in HTL.
-
-## Features
-
-* It is composed of Text Field, CheckBox and CheckBox Groups
-* Allows to author a Terms & Conditions component with either links or Texts.
-* Comes with some OOTB behaviour like
-  * Approval Checkbox is not enabled if the text-area is scrollable and user has not scrolled to the bottom
-  * Approval Checkbox is not enabled if TnC uses Links and user has not visited all the links
-
-### Use Object
-The Form Text component uses the `com.adobe.cq.forms.core.components.models.form.TermsAndConditions` Sling Model for its Use-object.
-
-### Edit Dialog Properties
-The following properties are written to JCR for this Form Text component and are expected to be available as `Resource` properties:
-
-1. `./jcr:title` - defines the label to use for this field
-2. `./hideTitle` - if set to `true`, the label of this field will be hidden
-3. `./name` - defines the name of the field, which will be submitted with the form data
-4. `./default` - defines the default value of the field
-5. `./description` - defines a help message that can be rendered in the field as a hint for the user
-6. `./required` - if set to `true`, this field will be marked as required, not allowing the form to be submitted until the field has a value
-7. `./requiredMessage` - defines the message displayed as tooltip when submitting the form if the value is left empty
-8. `./readOnly` - if set to `true`, the filed will be read only
-9. `./showApprovalOption` - whether to show the approval checkbox or not
-10. `./showLink` - whether to show links instead of Text Content
-11. `./showAsPopup` - whether to show the TNC content as a Modal
-
-## Client Libraries
-The component provides a `core.forms.components.termsandconditions.v1.runtime` client library category that contains the Javascript runtime for the component.
-It should be added to a relevant site client library using the `embed` property.
-
-It also provides a `core.forms.components.termsandconditions.v1.editor` editor client library category that includes
-JavaScript handling for dialog interaction. It is already included by its edit dialog.
-
-## BEM Description
-```
-BLOCK cmp-adaptiveform-termsandcondition
-    ELEMENT cmp-adaptiveform-termsandcondition__label-container
-    ELEMENT cmp-adaptiveform-termsandcondition__label
-    ELEMENT cmp-adaptiveform-termsandcondition__questionmark
-    ELEMENT cmp-adaptiveform-termsandcondition__content-container
-      MODIFIER cmp-adaptiveform-termsandcondition__content-container--modal
-    ELEMENT cmp-adaptiveform-termsandcondition__body
-    ELEMENT cmp-adaptiveform-termsandcondition__header
-    ELEMENT cmp-adaptiveform-termsandcondition__close-button
-    ELEMENT cmp-adaptiveform-termsandcondition__content
-    ELEMENT cmp-adaptiveform-termsandcondition__text
-    ELEMENT cmp-adaptiveform-termsandcondition__text .cmp-adaptiveform-text
-    ELEMENT cmp-adaptiveform-termsandcondition__text-intersect
-    ELEMENT cmp-adaptiveform-termsandcondition__link
-    ELEMENT cmp-adaptiveform-termsandcondition__link .cmp-adaptiveform-checkboxgroup 
-    ELEMENT cmp-adaptiveform-termsandcondition__approvalcheckbox
-    ELEMENT cmp-adaptiveform-termsandcondition__approvalcheckbox .cmp-adaptiveform-checkbox
-    ELEMENT cmp-adaptiveform-termsandcondition__shortdescription
-    ELEMENT cmp-adaptiveform-termsandcondition__longdescription
-    ELEMENT cmp-adaptiveform-termsandcondition__errormessage
-```
-
-
-
-## JavaScript Data Attribute Bindings
-
-The following attributes must be added for the initialization of the text-input component in the form view:
-1. `data-cmp-is="adaptiveFormTermsAndConditions"`
-2. `data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"`
-3. `data-cmp-visible` having a boolean value to indicate whether the field is currently visible or not
-4. `data-cmp-enabled` having a boolean value to indicate whether the field is currently enabled or not
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml
deleted file mode 100644
index 109a9c1d7f..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2022 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root
-  xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-  xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
-  xmlns:cq="http://www.day.com/jcr/cq/1.0"
-  xmlns:jcr="http://www.jcp.org/jcr/1.0"
-  xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-  jcr:primaryType="nt:unstructured"
-  jcr:title="Adaptive Form Terms and Conditions"
-  sling:resourceType="cq/gui/components/authoring/dialog"
-  helpPath="https://www.adobe.com/go/aem_af_cmp_termsandconditions_v1"
-  trackingFeature="core-components:adaptiveform-termsandconditions:v1"
-  extraClientlibs="[core.forms.components.termsandconditions.v1.editor]">
-    <content
-      jcr:primaryType="nt:unstructured"
-      sling:resourceType="granite/ui/components/coral/foundation/container"
-      granite:class="cmp-adaptiveform-termsandconditions__editdialog">
-        <items jcr:primaryType="nt:unstructured">
-            <tabs
-              jcr:primaryType="nt:unstructured"
-              sling:resourceType="granite/ui/components/coral/foundation/tabs"
-              maximized="{Boolean}true"
-              granite:class="cmp-adaptiveform-base__editdialogbasic">
-                <items jcr:primaryType="nt:unstructured">
-                    <basic
-                      jcr:primaryType="nt:unstructured"
-                      jcr:title="Basic"
-                      sling:resourceType="granite/ui/components/coral/foundation/container"
-                      margin="{Boolean}true">
-                        <items jcr:primaryType="nt:unstructured">
-                            <columns
-                              jcr:primaryType="nt:unstructured"
-                              sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
-                              margin="{Boolean}true">
-                                <items jcr:primaryType="nt:unstructured">
-                                    <column
-                                      jcr:primaryType="nt:unstructured"
-                                      sling:resourceType="granite/ui/components/coral/foundation/container">
-                                        <items jcr:primaryType="nt:unstructured">
-                                            <name
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/name"/>
-                                            <title
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
-                                            <showApprovalOption
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                                              name="./showApprovalOption"
-                                              value="true"
-                                              text="Show approval options"
-                                              checked="{Boolean}true"
-                                              uncheckedValue="{Boolean}false"
-                                              granite:class="cmp-adaptiveform-termsandconditions__showapprovaloption" />
-                                            <showAsPopUp
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                                              name="./showAsPopup"
-                                              value="true"
-                                              text="Show as a pop-up"
-                                              granite:class="cmp-adaptiveform-termsandconditions__showaspopup" />
-                                            <showAsLink
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                                              name="./showLink"
-                                              value="true"
-                                              text="Replace consent text with weblink(s)"
-                                              fieldDescription="If unchecked, the default rendition will be text content."/>
-                                            <showAsLink-typehint
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
-                                              name="./showLink@TypeHint"
-                                              value="Boolean"/>
-                                            <richTextTitle
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/richTextTitle"/>
-                                            <isTitleRichText
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/isTitleRichText"/>
-                                            <hideTitle
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/hideTitle"/>
-                                            <wrapData
-                                              granite:class="cmp-adaptiveform-panel__wrapData"
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
-                                              name="./wrapData"
-                                              text="Group child components' data on form submission"
-                                              uncheckedValue="false"
-                                              value="true"/>
-                                            <wrapData-typehint
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
-                                              name="./wrapData@TypeHint"
-                                              value="Boolean"/>
-                                            <bindref
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/bindref"/>
-                                            <visible
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/visible"/>
-                                            <visible-typehint
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/visible-typehint"/>
-                                            <enabled
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/enabled"/>
-                                            <enabled-typehint
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/enabled-typehint"/>
-                                            <readonly
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/readonly"/>
-                                            <readonly-typehint
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/include"
-                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/readonly-typehint"/>
-                                        </items>
-                                    </column>
-                                </items>
-                            </columns>
-                        </items>
-                    </basic>
-                    <help
-                      jcr:primaryType="nt:unstructured"
-                      sling:resourceType="granite/ui/components/coral/foundation/include"
-                      path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/help"/>
-                    <accessibility
-                      jcr:primaryType="nt:unstructured"
-                      sling:resourceType="granite/ui/components/coral/foundation/include"
-                      path="core/fd/components/form/panelcontainer/v1/panelcontainer/cq:dialog/content/items/tabs/items/accessibility"/>
-                    <dor
-                      jcr:primaryType="nt:unstructured"
-                      sling:resourceType="granite/ui/components/coral/foundation/include"
-                      path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/dor"/>
-                </items>
-            </tabs>
-        </items>
-    </content>
-</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_editConfig.xml
deleted file mode 100755
index 5eb7044978..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_editConfig.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
-      jcr:primaryType="cq:EditConfig"
-      cq:actions="[edit,-,copymove,delete,-,insert,-]"
-      cq:dialogMode="floating"
-      cq:layout="editbar"
-      cq:disableTargeting="{Boolean}true">
-    <cq:listeners
-        jcr:primaryType="cq:EditListenersConfig"
-        afterchildinsert="function(editable){Granite.author.responsive.EditableActions.REFRESH.execute(editable)}"/>
-    <cq:actionConfigs jcr:primaryType="nt:unstructured">
-        <editexpression
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.openRuleEditor"
-                order="after CONFIGURE"
-                icon="bidRule"
-                text="Edit Rules"/>
-        <replace
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.replace"
-                icon="shuffle"
-                text="Replace"/>
-    </cq:actionConfigs>
-</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_template.xml
deleted file mode 100644
index 95a10387e4..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_template.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
-  jcr:primaryType="nt:unstructured"
-  jcr:title="Terms And Conditions"
-  fieldType="panel"
-  fd:tnc="{Boolean}true"
-  wrapData="{Boolean}true">
-  <text
-    name="consenttext"
-    jcr:primaryType="nt:unstructured"
-    jcr:title="\0"
-    sling:resourceType="core/fd/components/form/text/v1/text"
-    fieldType="plain-text"
-    hideTitle="true"
-    value="Text related to the terms and conditions come here"/>
-  <approvalcheckbox
-    name="approvalcheckbox"
-    jcr:primaryType="nt:unstructured"
-    jcr:title="I agree to the terms &amp; conditions"
-    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
-    enabled="false"
-    checkedValue="true"
-    fieldType="checkbox">
-  </approvalcheckbox>
-  <link
-    jcr:primaryType="nt:unstructured"
-    jcr:title="\0"
-    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
-    orientation="vertical"
-    type="string[]"
-    enum="your-link-here"
-    enumNames="[label for the link]"
-    fieldType="checkbox-group"
-    title="I agree to the terms &amp; conditions">
-    <fd:rules
-      jcr:primaryType="nt:unstructured"
-      validationStatus="valid"/>
-    <fd:events
-      jcr:primaryType="nt:unstructured"
-      change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
-  </link>
-</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/.content.xml
deleted file mode 100644
index 491392d539..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/.content.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/.content.xml
deleted file mode 100644
index 0c6786f297..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/.content.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="cq:ClientLibraryFolder"
-    categories="[core.forms.components.termsandconditions.v1.editor]"
-    dependencies="[core.forms.components.base.v1.editor, core.forms.components.commons.v1.editor.utils]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css.txt
deleted file mode 100644
index e31d85b9c6..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright 2023 Adobe
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-
-#base=css
-termsandconditions.css
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css/termsandconditions.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css/termsandconditions.css
deleted file mode 100644
index 84f90bfe93..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css/termsandconditions.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-.coral-Form-fieldwrapper.cmp-adaptiveform-termsandconditions__showAsLink {
-  display: flex;
-}
-.coral-Form-fieldwrapper.cmp-adaptiveform-termsandconditions__showAsLink label {
-  padding-right: 10px;
-}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js.txt
deleted file mode 100644
index f135f85471..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright 2023 Adobe
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-
-#base=js
-termsandconditions.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js/termsandconditions.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js/termsandconditions.js
deleted file mode 100644
index 59bb65f88f..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js/termsandconditions.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-/* global jQuery */
-(function($) {
-    "use strict";
-
-    const Utils = window.CQ.FormsCoreComponents.Utils.v1,
-        EDIT_DIALOG = ".cmp-adaptiveform-termsandconditions__editdialog";
-
-    /**
-     * Automatically enables approvalOption is shoAsPopup is selected
-     * @param dialog
-     */
-    function handleToggleOfApprovalOptions(dialog) {
-        const approvalOption = dialog.find('.cmp-adaptiveform-termsandconditions__showapprovaloption[name="./showApprovalOption"]')[0];
-        const showAsPopupWidget = dialog.find('.cmp-adaptiveform-termsandconditions__showaspopup[name="./showAsPopup"]')[0];
-        let showAsPopup = dialog.find('.cmp-adaptiveform-termsandconditions__showaspopup[name="./showAsPopup"]')[0]['checked'];
-        function toggleApprovalOption(show) {
-            if (show) {
-                approvalOption.readOnly=false;
-                approvalOption.style.opacity = "1";
-            } else {
-                approvalOption.readOnly=true;
-                approvalOption.style.opacity = "0.5"
-            }
-        }
-        if (showAsPopup) {
-            if (!approvalOption.checked) {
-                approvalOption['checked']=true;
-            }
-            toggleApprovalOption(false);
-        }
-        showAsPopupWidget.addEventListener('click', function() {
-            showAsPopup = !showAsPopup;
-            if (showAsPopup) {
-                if (!approvalOption.checked) {
-                    approvalOption.click();
-                }
-                toggleApprovalOption(false);
-            } else {
-                toggleApprovalOption(true);
-            }
-        })
-    }
-
-    Utils.initializeEditDialog(EDIT_DIALOG)(handleToggleOfApprovalOptions);
-
-})(jQuery);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/.content.xml
deleted file mode 100644
index 124dfb0e20..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/.content.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="cq:ClientLibraryFolder"
-    categories="[core.forms.components.termsandconditions.v1.runtime]"
-    dependencies="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css.txt
deleted file mode 100644
index 468a1dcd56..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright 2023 Adobe
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-
-#base=css
-termsandconditions.css
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css/termsandconditions.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css/termsandconditions.css
deleted file mode 100644
index 6cde69339f..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css/termsandconditions.css
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-.cmp-adaptiveform-termsandcondition{
-
-}
-
-.cmp-adaptiveform-termsandcondition__label {
-
-}
-
-.cmp-adaptiveform-termsandcondition__content-container {
-
-}
-
-.cmp-adaptiveform-termsandcondition__content-container--modal {
-
-}
-.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__body{
-
-}
-.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__header{
-
-}
-.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__header h3{
-
-}
-
-
-.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__close-button {
-
-}
-
-.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__content {
-
-}
-
-.cmp-adaptiveform-termsandcondition__text {
-
-}
-
-.cmp-adaptiveform-termsandcondition__link {
-
-}
-
-.cmp-adaptiveform-termsandcondition__approvalcheckbox .cmp-adaptiveform-checkbox__label{
-  cursor:pointer;
-}
-
-.cmp-adaptiveform-termsandcondition__approvalcheckbox {
-
-}
-
-
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js.txt
deleted file mode 100644
index 6aa7350c9e..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright 2023 Adobe
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-
-#base=js
-termsandconditionsview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js/termsandconditionsview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js/termsandconditionsview.js
deleted file mode 100644
index 632f5c6aeb..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js/termsandconditionsview.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-(function () {
-
-    class TermsAndConditions extends FormView.FormPanel {
-        static NS = FormView.Constants.NS;
-        static IS = "adaptiveFormTermsAndConditions";
-        static bemBlock = 'cmp-adaptiveform-termsandcondition';
-        static selectors = {
-            self: "[data-" + this.NS + '-is="' + this.IS + '"]',
-            label: `.${TermsAndConditions.bemBlock}__label`,
-            description: `.${TermsAndConditions.bemBlock}__longdescription`,
-            qm: `.${TermsAndConditions.bemBlock}__questionmark`,
-            tooltipDiv: `.${TermsAndConditions.bemBlock}__shortdescription`,
-            tncContentWrapper: `.${TermsAndConditions.bemBlock}__content-container`,
-            closePopupButton: `.${TermsAndConditions.bemBlock}__close-button`
-        };
-
-        constructor(params) {
-            super(params);
-            this.#handleScroll()
-        }
-
-        addChild(childView) {
-            super.addChild(childView);
-            if (childView.getModel()._jsonModel.fieldType === 'checkbox-group') {
-                this.#addLinkClickListener(childView);
-            }
-            if (childView.getModel()._jsonModel.fieldType === 'checkbox') {
-                this.#handlePopup(childView);
-            }
-        }
-
-        #addLinkClickListener(childView) {
-            childView.getWidgets().querySelectorAll('label').forEach((item) => {
-                const checkboxInput = item.querySelector('input');
-                item.querySelector('a').addEventListener('click', (e) => {
-                    checkboxInput.click();
-                })
-            })
-        }
-
-        #handleScroll() {
-            const intersection = this.element.querySelector('.cmp-adaptiveform-termsandcondition__text-intersect');
-            if (intersection) {
-                const self = this;
-                const io = new IntersectionObserver(onIntersection, {
-                    threshold: [1],
-                })
-                function onIntersection ([{isIntersecting}]) {
-                    if (isIntersecting) {
-                        self.children.filter(c => c.getModel()._jsonModel.fieldType === 'checkbox').forEach(cb => cb.updateEnabled(true))
-                        io.unobserve(intersection);
-                    }
-                }
-                io.observe(intersection)
-            }
-        }
-
-        #handlePopup(approvalCheckbox) {
-            const closePopUpBtn = this.getClosePopupButton();
-            if (closePopUpBtn) {
-                closePopUpBtn.addEventListener('click', () => {
-                    this.toggleAttribute(this.getContentDivWrapper(), false, 'data-cmp-visible', false);
-                })
-
-                approvalCheckbox.label.addEventListener('click', () => {
-                    const contentDiv = this.getContentDivWrapper();
-                    if (contentDiv) {
-                        this.toggleAttribute(this.getContentDivWrapper(), true, 'data-cmp-visible', false);
-                    }
-                })
-            }
-        }
-
-        getContentDivWrapper() {
-            return this.element.querySelector(TermsAndConditions.selectors.tncContentWrapper);
-        }
-
-        getClosePopupButton() {
-            return this.element.querySelector(TermsAndConditions.selectors.closePopupButton);
-        }
-
-        getWidget() {
-            return null;
-        }
-
-        getDescription() {
-            return this.element.querySelector(TermsAndConditions.selectors.description);
-        }
-
-        getLabel() {
-            return null;
-        }
-
-        getErrorDiv() {
-            return null;
-        }
-
-        getTooltipDiv() {
-            return this.element.querySelector(TermsAndConditions.selectors.tooltipDiv);
-        }
-
-        getQuestionMarkDiv() {
-            return this.element.querySelector(TermsAndConditions.selectors.qm);
-        }
-    }
-
-    FormView.Utils.setupField(({element, formContainer}) => {
-        return new TermsAndConditions({element, formContainer})
-    }, TermsAndConditions.selectors.self);
-})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html
deleted file mode 100644
index 01d0522030..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-
-<sly data-sly-use.tnc="com.adobe.cq.forms.core.components.models.form.TermsAndConditions"
-     data-sly-use.renderer="${'termsandconditions.js'}"
-     data-sly-use.label="${renderer.labelPath}"
-     data-sly-use.shortDescription="${renderer.shortDescriptionPath}"
-     data-sly-use.longDescription="${renderer.longDescriptionPath}"
-     data-sly-use.questionMark="${renderer.questionMarkPath}"
-     data-sly-use.clientlib="${'/libs/granite/sightly/templates/clientlib.html'}">
-</sly>
-
-<div class="cmp-adaptiveform-termsandcondition"
-     data-cmp-is="adaptiveFormTermsAndConditions"
-     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
-     data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
-     id="${tnc.id}"
-     title="${tnc.tooltipVisible ? '' : tnc.tooltipText}"
-     data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}">
-    <div class="cmp-adaptiveform-termsandcondition__label-container">
-        <div data-sly-call="${label.label @componentId=tnc.id, labelValue=tnc.label.value, labelVisible=tnc.label.visible, labelRichText=tnc.label.richText, bemBlock='cmp-adaptiveform-termsandcondition'}" data-sly-unwrap></div>
-        <div data-sly-call="${questionMark.questionMark @componentId=tnc.id, longDescription=tnc.description, bemBlock='cmp-adaptiveform-termsandcondition'}" data-sly-unwrap></div>
-    </div>
-    <div class="cmp-adaptiveform-termsandcondition__content-container ${!wcmmode.edit && tnc.showAsPopup ? 'cmp-adaptiveform-termsandcondition__content-container--modal' : ''}"
-         data-cmp-visible="${tnc.showAsPopup ? 'false' : 'true'}">
-        <div class="cmp-adaptiveform-termsandcondition__body">
-            <div class="cmp-adaptiveform-termsandcondition__header" data-sly-test="${tnc.showAsPopup && !wcmmode.edit}">
-                <button type="button" class="cmp-adaptiveform-termsandcondition__close-button" >
-                    X
-                </button>
-                <h3>
-                    ${"Please review the terms and conditions" @ i18n, context='html'}
-                </h3>
-            </div>
-            <div class="cmp-adaptiveform-termsandcondition__content">
-                <div data-sly-test="${!tnc.showLink}" class="cmp-adaptiveform-termsandcondition__text">
-                    <div  data-sly-resource="${'text'}"></div>
-                    <div class="cmp-adaptiveform-termsandcondition__text-intersect"></div>
-                </div>
-                <div class="cmp-adaptiveform-termsandcondition__link" data-sly-test="${tnc.showLink}" data-sly-resource="${'link'}"></div>
-            </div>
-        </div>
-    </div>
-    <div class="cmp-adaptiveform-termsandcondition__approvalcheckbox"  data-sly-test="${tnc.showApprovalOption}"  data-sly-resource="${'approvalcheckbox'}"></div>
-    <div data-sly-call="${shortDescription.shortDescription @componentId=tnc.id, shortDescriptionVisible=tnc.tooltipVisible, shortDescription=tnc.tooltip, bemBlock='cmp-adaptiveform-termsandcondition'}" data-sly-unwrap></div>
-    <div data-sly-call="${longDescription.longDescription @componentId=tnc.id, longDescription=tnc.description, bemBlock='cmp-adaptiveform-termsandcondition'}" data-sly-unwrap></div>
-</div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.js
deleted file mode 100644
index e7bcebd928..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2023 Adobe
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~     http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-use(function () {
-
-  var labelPath = 'core/fd/components/af-commons/v1/fieldTemplates/label.html';
-  var shortDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/shortDescription.html";
-  var longDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/longDescription.html";
-  var questionMarkPath = "core/fd/components/af-commons/v1/fieldTemplates/questionMark.html";
-  return {
-    labelPath: labelPath,
-    shortDescriptionPath: shortDescriptionPath,
-    longDescriptionPath: longDescriptionPath,
-    questionMarkPath: questionMarkPath
-  }
-});
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
index 49933fa77a..c899544fbb 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
@@ -145,10 +145,5 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html
index b07c2e6ed9..9ebfcd21cf 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html
@@ -22,8 +22,7 @@
      data-cmp-data-layer="${textModel.data.json}"
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-cmp-visible="${textModel.visible}"
-     class="cmp-adaptiveform-text cmp-adaptiveform-text__label"
-     data-richtext>
+     class="cmp-adaptiveform-text">
     <div
          data-sly-test.text="${textModel.value}"
          tabindex="0">
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
index 1cd354c995..54671cb4ed 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
@@ -33,7 +33,7 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[text.id, 'widget']}">
     <div class="cmp-adaptiveform-textinput__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=text.label.value, labelVisible=text.label.visible, labelRichText=text.label.richText, bemBlock='cmp-adaptiveform-textinput'}" data-sly-unwrap></div>
+      <div data-sly-call="${label.label @componentId=widgetId, labelValue=text.label.value, labelVisible=text.label.visible, bemBlock='cmp-adaptiveform-textinput'}" data-sly-unwrap></div>
       <div data-sly-call="${questionMark.questionMark @componentId=text.id, longDescription=text.description, bemBlock='cmp-adaptiveform-textinput'}" data-sly-unwrap></div>
     </div>
     <textarea data-sly-test.useTextarea="${text.multiLine}"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v1/title/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v1/title/_cq_editConfig.xml
index 6cdd6cdcd3..339ccec303 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v1/title/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v1/title/_cq_editConfig.xml
@@ -35,10 +35,5 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/.content.xml
deleted file mode 100644
index 3977155bee..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/.content.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2022 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/.content.xml
deleted file mode 100644
index 69774ca1cc..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/.content.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:unstructured">
-    <toggleablelink/>
-</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml
deleted file mode 100644
index 0d0d725d7c..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    cq:icon="panel"
-    cq:isContainer="{Boolean}true"
-    jcr:description="Toggleable Links"
-    jcr:primaryType="cq:Component"
-    jcr:title="Adaptive Form Toggleable Link (v1)"
-    sling:resourceSuperType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
-    componentGroup=".hidden"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_dialog/.content.xml
deleted file mode 100644
index 9bbce859e2..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_dialog/.content.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:unstructured"
-    jcr:title="Adaptive Form Toggleable Link field"
-    sling:resourceType="cq/gui/components/authoring/dialog"
-    extraClientlibs="[core.forms.components.checkboxgroup.v1.editor]">
-    <content
-        granite:class="cmp-adaptiveform-checkboxgroup__editdialog"
-        jcr:primaryType="nt:unstructured"
-        sling:resourceType="granite/ui/components/coral/foundation/container">
-        <items jcr:primaryType="nt:unstructured">
-            <tabs jcr:primaryType="nt:unstructured"
-              sling:resourceType="granite/ui/components/coral/foundation/tabs"
-              maximized="{Boolean}true">
-                <items jcr:primaryType="nt:unstructured">
-                    <basic
-                      jcr:primaryType="nt:unstructured"
-                      jcr:title="Basic"
-                      sling:resourceType="granite/ui/components/coral/foundation/container">
-                        <items jcr:primaryType="nt:unstructured">
-                            <columns
-                              jcr:primaryType="nt:unstructured"
-                              sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
-                              margin="{Boolean}true">
-                                <items jcr:primaryType="nt:unstructured">
-                                    <column
-                                      jcr:primaryType="nt:unstructured"
-                                      sling:resourceType="granite/ui/components/coral/foundation/container">
-                                        <items jcr:primaryType="nt:unstructured">
-                                            <placeholder
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:hideResource="{Boolean}true" />
-                                            <type
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:hideResource="{Boolean}true" />
-                                            <value
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:hideResource="{Boolean}true" />
-                                            <alignment
-                                              jcr:primaryType="nt:unstructured"
-                                              sling:hideResource="{Boolean}true" />
-                                            <enums jcr:primaryType="nt:unstructured"
-                                              sling:resourceType="granite/ui/components/coral/foundation/container">
-                                                <items jcr:primaryType="nt:unstructured">
-                                                    <enumOptions jcr:primaryType="nt:unstructured"
-                                                      sling:orderBefore="bindref"
-                                                      sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                                                      fieldDescription="Enter the display text with link."
-                                                      fieldLabel="Links">
-                                                        <field jcr:primaryType="nt:unstructured"
-                                                          sling:resourceType="granite/ui/components/coral/foundation/container"
-                                                          name="./enum">
-                                                            <items jcr:primaryType="nt:unstructured">
-                                                                <enum jcr:primaryType="nt:unstructured"
-                                                                  sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                                  granite:class="cmp-adaptiveform-base__enum"
-                                                                  name="./enum"
-                                                                  fieldLabel="Link"
-                                                                  fieldDescription="Enter the link."
-                                                                  required="{Boolean}true"/>
-                                                                <enumNames
-                                                                  jcr:primaryType="nt:unstructured"
-                                                                  sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                                  granite:class="cmp-adaptiveform-base__enumNames"
-                                                                  name="./enumNames"
-                                                                  fieldLabel="Display text"
-                                                                  fieldDescription="Specify the content to display in the adaptive form."
-                                                                  required="{Boolean}false"/>
-                                                            </items>
-                                                        </field>
-                                                    </enumOptions>
-                                                    <enumNames jcr:primaryType="nt:unstructured"
-                                                      sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                                                      granite:hidden="true">
-                                                        <field jcr:primaryType="nt:unstructured"
-                                                          sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                          name="./enumNames"
-                                                          granite:class="cmp-adaptiveform-base__enumNamesHidden"
-                                                          granite:hidden="true"/>
-                                                    </enumNames>
-                                                </items>
-                                            </enums>
-                                        </items>
-                                    </column>
-                                </items>
-                            </columns>
-                        </items>
-                    </basic>
-                </items>
-            </tabs>
-        </items>
-    </content>
-</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_template.xml
deleted file mode 100644
index dbdb9ae264..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_template.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
-    jcr:primaryType="nt:unstructured"
-    jcr:title="Adaptive Form Toggleable Link (v1)"
-    fieldType="checkbox-group"
-    type="string[]"
-    enum="[link]"
-    enumNames="[Your Link]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html
deleted file mode 100644
index 052452aecc..0000000000
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2023 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<template data-sly-template.widget="${ @ checkboxgroup }">
-  <div class="cmp-adaptiveform-checkboxgroup__widget ${checkboxgroup.orientation}" id="${widgetId}">
-    <div data-sly-list="${checkboxgroup.enums}" data-sly-unwrap>
-      <div class="cmp-adaptiveform-checkboxgroup-item ${checkboxgroup.name}">
-        <label class="cmp-adaptiveform-checkboxgroup__option-label"
-               title="${checkboxgroup.tooltipVisible ? '' : checkboxgroup.tooltipText}">
-          <input class="cmp-adaptiveform-checkboxgroup__option__widget" type="checkbox"
-                 style="display: none;"
-                 name="${checkboxgroup.name}"
-                 value="${checkboxgroup.enums[itemList.index].toString}"
-                 checked="${checkboxgroup.enums[itemList.index] in checkboxgroup.default }"
-                 disabled="${!checkboxgroup.enabled || checkboxgroup.readOnly}"
-                 aria-readonly="${checkboxgroup.readOnly ? 'true' : ''}"/>
-          <a class="cmp-adaptiveform-checkboxgroup__links" title="${checkboxgroup.enumNames[itemList.index]}" href="${checkboxgroup.enums[itemList.index].toString@context='uri'}" target="_blank">
-            ${checkboxgroup.enumNamesAsTextContent[itemList.index].value @ context = checkboxgroup.enumNamesAsTextContent[itemList.index].richText ? 'html' : 'text'}
-          </a>
-        </label>
-      </div>
-    </div>
-  </div>
-</template>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_editConfig.xml
index 2e503a491a..ad687a1ee9 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_editConfig.xml
@@ -36,10 +36,5 @@
                 jcr:primaryType="nt:unstructured"
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
 </jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/_cq_editConfig.xml
index e288e7d1a8..076570341c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/_cq_editConfig.xml
@@ -37,10 +37,5 @@
                 handler="CQ.FormsCoreComponents.editorhooks.replace"
                 icon="shuffle"
                 text="Replace"/>
-        <qualifiedName
-                jcr:primaryType="nt:unstructured"
-                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
-                icon="viewSOMExpression"
-                text="View Qualified Name"/>
     </cq:actionConfigs>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/wizard.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/wizard.html
index c7b1bb63fa..664ba4d52c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/wizard.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v1/wizard/wizard.html
@@ -32,7 +32,7 @@
         data-placeholder-text="${'Please drag Wizard components here' @ i18n}"
         data-sly-test.widgetId="${'{0}-{1}' @ format=[wizard.id, 'widget']}">
         <div class="cmp-adaptiveform-wizard__label-container">
-          <div data-sly-call="${label.label @componentId=widgetId, labelValue=wizard.label.value, labelVisible=wizard.label.visible, labelRichText=wizard.label.richText, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
+          <div data-sly-call="${label.label @componentId=widgetId, labelValue=wizard.label.value, labelVisible=wizard.label.visible, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
           <div data-sly-call="${questionMark.questionMark @componentId=wizard.id, longDescription=wizard.description, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
         </div>
         <div data-sly-call="${shortDescription.shortDescription @componentId=wizard.id, shortDescriptionVisible=wizard.tooltipVisible, shortDescription=wizard.tooltip, bemBlock='cmp-adaptiveform-wizard'}" data-sly-unwrap></div>
diff --git a/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v1/aemform/iframe.html b/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v1/aemform/iframe.html
index d0346766c5..1f5e531965 100644
--- a/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v1/aemform/iframe.html
+++ b/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v1/aemform/iframe.html
@@ -14,10 +14,10 @@
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
 <!DOCTYPE html>
-<sly data-sly-use.form="com.adobe.cq.forms.core.components.models.aemform.AEMForm"/>
-<html lang="${form.locale || 'en'}">
-<head>
-    <sly data-sly-use.templates="core/wcm/components/commons/v1/templates.html"/>
+<html>
+<head lang="en">
+    <sly data-sly-use.form="com.adobe.cq.forms.core.components.models.aemform.AEMForm"
+         data-sly-use.templates="core/wcm/components/commons/v1/templates.html"/>
     <title data-sly-test="${form.isAdaptiveForm || form.isMCDocument}"><sly data-sly-use.af="com.adobe.aemds.guide.common.AdaptiveForm" />${af.formTitle @ context='html'}</title>
     <meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta name="robots" content="noindex, nofollow"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/iframe.html b/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/iframe.html
index 69a4e8d12e..fd4a044aea 100644
--- a/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/iframe.html
+++ b/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/iframe.html
@@ -14,10 +14,10 @@
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
 <!DOCTYPE html>
-<sly data-sly-use.form="com.adobe.cq.forms.core.components.models.aemform.AEMForm"/>
-<html lang="${form.locale || 'en'}">
-<head>
-    <sly data-sly-use.templates="core/wcm/components/commons/v1/templates.html"/>
+<html>
+<head lang="en">
+    <sly data-sly-use.form="com.adobe.cq.forms.core.components.models.aemform.AEMForm"
+         data-sly-use.templates="core/wcm/components/commons/v1/templates.html"/>
     <title data-sly-test="${form.isAdaptiveForm || form.isMCDocument}"><sly data-sly-use.af="com.adobe.aemds.guide.common.AdaptiveForm" />${af.formTitle @ context='html'}</title>
     <meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta name="robots" content="noindex, nofollow"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/core/fd/components/formsportal/link/v1/link/clientlibs/editor/js/linkcomponent.js b/ui.apps/src/main/content/jcr_root/apps/core/fd/components/formsportal/link/v1/link/clientlibs/editor/js/linkcomponent.js
index 96e2b13be5..dc7082966a 100644
--- a/ui.apps/src/main/content/jcr_root/apps/core/fd/components/formsportal/link/v1/link/clientlibs/editor/js/linkcomponent.js
+++ b/ui.apps/src/main/content/jcr_root/apps/core/fd/components/formsportal/link/v1/link/clientlibs/editor/js/linkcomponent.js
@@ -13,8 +13,8 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-/* global jQuery, Coral, Granite */
-(function ($, Coral, Granite) {
+/* global jQuery, Coral */
+(function ($, Coral) {
     var initQueryParametersTab = function () {
         var btn = $('.cmp-formsportal-link--editor-parameters > ._coral-Button')[0];
         var multifield = $('.cmp-formsportal-link--editor-parameters')[0];
@@ -25,7 +25,7 @@
                 // overrides the default multi-field button
                 btn.set({
                     label: {
-                        innerHTML: Granite.I18n.get("Add Item")
+                        innerHTML: "Add Item"
                     },
                     icon: "add"
                 });
@@ -48,4 +48,4 @@
     $(document).on("dialog-ready", function () {
         initQueryParametersTab();
     });
-}(jQuery, Coral, Granite));
+}(jQuery, Coral));
diff --git a/ui.frontend/src/index.js b/ui.frontend/src/index.js
index 3158145bbf..99eed1aac0 100644
--- a/ui.frontend/src/index.js
+++ b/ui.frontend/src/index.js
@@ -15,8 +15,8 @@
  ******************************************************************************/
 import Utils from "./utils.js";
 import LanguageUtils from "./LanguageUtils.js";
-import {createFormInstance, FileObject, extractFileInfo, Click, Change, Submit, Blur, AddItem, RemoveItem, CustomEvent} from "@aemforms/af-core";
-import {FormField, FormContainer, FormFieldBase, FormPanel, FormTabs, FormCheckBox} from "./view/index.js";
+import {createFormInstance, FileObject, extractFileInfo, Click, Change, Submit, Blur, AddItem, RemoveItem} from "@aemforms/af-core";
+import {FormField, FormContainer, FormFieldBase, FormPanel, FormTabs} from "./view/index.js";
 import {Constants} from "./constants.js";
 import GuideBridge from "./GuideBridge.js";
 import HTTPAPILayer from "./HTTPAPILayer.js";
@@ -47,7 +47,7 @@ window.guideBridge = new GuideBridge();
  * @property {string} RemoveItem - The action for removing an item.
  */
 const Actions = {
-    Click, Change, Submit, Blur, AddItem, RemoveItem, CustomEvent
+    Click, Change, Submit, Blur, AddItem, RemoveItem
 }
 
 /**
@@ -77,4 +77,4 @@ const FileAttachmentUtils = {
  */
 
 
-export {createFormInstance, FormTabs, FormField, FormFieldBase, FormPanel, FormContainer, Constants, Utils, Actions, HTTPAPILayer, FileAttachmentUtils, Formatters, LanguageUtils, FunctionRuntime, FormCheckBox};
+export {createFormInstance, FormTabs, FormField, FormFieldBase, FormPanel, FormContainer, Constants, Utils, Actions, HTTPAPILayer, FileAttachmentUtils, Formatters, LanguageUtils, FunctionRuntime};
diff --git a/ui.frontend/src/utils.js b/ui.frontend/src/utils.js
index f66990099f..4d0b447ce7 100644
--- a/ui.frontend/src/utils.js
+++ b/ui.frontend/src/utils.js
@@ -117,10 +117,8 @@ class Utils {
     static #createFormContainerFields(fieldElements, fieldCreator, formContainer) {
         for (let i = 0; i < fieldElements.length; i++) {
             const elementId = fieldElements[i].id;
-            const formPathInField = fieldElements[i].getAttribute('data-cmp-adaptiveformcontainer-path');
-            const formPath = formContainer.getFormElement().getAttribute('data-cmp-path');
             //check if field is already created, to avoid creating a new field for same id
-            if (formContainer.getField(elementId) == null && formPathInField == formPath) {
+            if (formContainer.getField(elementId) == null) {
                 let field = fieldCreator({
                     "element" : fieldElements[i],
                     "formContainer" : formContainer
diff --git a/ui.frontend/src/view/FormCheckBox.js b/ui.frontend/src/view/FormCheckBox.js
deleted file mode 100644
index bfcff396eb..0000000000
--- a/ui.frontend/src/view/FormCheckBox.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-import FormFieldBase from "./FormFieldBase.js";
-
-/**
- * Class representing components based on CheckBox.
- * @extends module:FormView~FormCheckBox
- */
-class FormCheckBox extends FormFieldBase {
-
-    constructor(params) {
-        super(params);
-    }
-
-    updateValue(modelValue) {
-        if (modelValue === this._model._jsonModel.enum[0]) {
-            this.widget.checked = true
-            this.widget.setAttribute(FormView.Constants.HTML_ATTRS.CHECKED, FormView.Constants.HTML_ATTRS.CHECKED)
-            this.widget.setAttribute(FormView.Constants.ARIA_CHECKED, true);
-        } else {
-            this.widget.checked = false
-            this.widget.removeAttribute(FormView.Constants.HTML_ATTRS.CHECKED);
-            this.widget.setAttribute(FormView.Constants.ARIA_CHECKED, false);
-        }
-        this.widget.value = modelValue;
-        super.updateEmptyStatus();
-    }
-
-    setModel(model) {
-        super.setModel(model);
-        this._onValue = this._model._jsonModel.enum[0];
-        this._offValue = this._model._jsonModel.enum[1];
-        this.widget.addEventListener('change', (e) => {
-            if (this.widget.checked) {
-                this._model.value = this._onValue;
-            } else {
-                this._model.value = this._offValue;
-            }
-        })
-
-    }
-}
-
-export default FormCheckBox;
\ No newline at end of file
diff --git a/ui.frontend/src/view/FormField.js b/ui.frontend/src/view/FormField.js
index a4b9d9c7d7..c079e35e23 100644
--- a/ui.frontend/src/view/FormField.js
+++ b/ui.frontend/src/view/FormField.js
@@ -77,11 +77,9 @@ class FormField {
     setActive() {
         if (!this.isActive()) {
             this.element.setAttribute(Constants.DATA_ATTRIBUTE_ACTIVE, true);
-            this.element.scrollIntoView({ behavior: 'smooth', block: 'start' });
         }
         if (this.parentView && this.parentView.setActive) {
             this.parentView.setActive();
-            this.element.scrollIntoView({ behavior: 'smooth', block: 'start' });
         }
     }
 
diff --git a/ui.frontend/src/view/index.js b/ui.frontend/src/view/index.js
index 01e9d297fc..23320876e5 100644
--- a/ui.frontend/src/view/index.js
+++ b/ui.frontend/src/view/index.js
@@ -17,8 +17,7 @@ import FormContainer from "./FormContainer.js";
 import FormField from "./FormField.js";
 import FormFieldBase from "./FormFieldBase.js";
 import FormPanel from "./FormPanel.js";
-import FormTabs from "./FormTabs.js";
-import FormCheckBox from "./FormCheckBox.js";
+import FormTabs from "./FormTabs";
 
 
-export {FormField, FormContainer, FormFieldBase, FormPanel, FormTabs, FormCheckBox}
+export {FormField, FormContainer, FormFieldBase, FormPanel, FormTabs}
diff --git a/ui.tests/test-module/libs/commons/formsConstants.js b/ui.tests/test-module/libs/commons/formsConstants.js
index b12316f0ef..a54b572f16 100644
--- a/ui.tests/test-module/libs/commons/formsConstants.js
+++ b/ui.tests/test-module/libs/commons/formsConstants.js
@@ -44,10 +44,8 @@ var formsConstants = {
                 "wizard": "/apps/forms-components-examples/components/form/wizard",
                 "title": "/apps/forms-components-examples/components/form/title",
                 "checkbox": "/apps/forms-components-examples/components/form/checkbox",
-                "switch": "/apps/forms-components-examples/components/form/switch",
                 "fragment": "/apps/forms-components-examples/components/form/fragment",
                 "fragmentcontainer": "/apps/forms-components-examples/components/form/fragmentcontainer",
-                "termsandconditions": "/apps/forms-components-examples/components/form/termsandconditions"
             }
         },
         resourceType : {
diff --git a/ui.tests/test-module/libs/commons/localeDataSets.js b/ui.tests/test-module/libs/commons/localeDataSets.js
index 317249caf7..c8fe10f4c5 100644
--- a/ui.tests/test-module/libs/commons/localeDataSets.js
+++ b/ui.tests/test-module/libs/commons/localeDataSets.js
@@ -1,10 +1,8 @@
 const selectors = {
     ACCORDION: '.cmp-accordion > .cmp-accordion__label-container > label',
     BUTTON: '.button.base:not(.submit):not(.reset) span',
-    CHECK_BOX1: '.cmp-adaptiveform-checkboxgroup:has(.checkboxgroup1) .cmp-adaptiveform-checkboxgroup__label-container > label',
-    CHECK_BOX1_ITEM1: '.cmp-adaptiveform-checkboxgroup:has(.checkboxgroup1) > div > div > label > span',
-    CHECK_BOX2: '.cmp-adaptiveform-checkboxgroup:has(.checkboxgroup2) .cmp-adaptiveform-checkboxgroup__label-container > label',
-    CHECK_BOX2_ITEM1: '.cmp-adaptiveform-checkboxgroup:has(.checkboxgroup2) > div > div > label > span',
+    CHECK_BOX: '.cmp-adaptiveform-checkboxgroup .cmp-adaptiveform-checkboxgroup__label-container > label',
+    CHECK_BOX_ITEM1: '.cmp-adaptiveform-checkboxgroup > div > div > label > span',
     DATE_INPUT: '.cmp-adaptiveform-datepicker label',
     DROPDOWN: '.cmp-adaptiveform-dropdown label',
     EMAIL_INPUT: '.cmp-adaptiveform-emailinput__label',
@@ -28,10 +26,8 @@ const languages = [
         TRANSLATION: {
             ACCORDION: 'Accordion',
             BUTTON: 'Button',
-            CHECK_BOX1: 'Check Box Group',
-            CHECK_BOX1_ITEM1: 'Item 1',
-            CHECK_BOX2: 'Select Animal',
-            CHECK_BOX2_ITEM1: 'Dog',
+            CHECK_BOX: 'Check Box Group',
+            CHECK_BOX_ITEM1: 'Item 1',
             DATE_INPUT: 'Date Input',
             DROPDOWN: 'Dropdown',
             EMAIL_INPUT: 'Email Input',
@@ -58,10 +54,8 @@ const languages = [
         LANGUAGE: 'German', LOCALE: 'de', TRANSLATION: {
             ACCORDION: 'Akkordeon',
             BUTTON: 'Knopf',
-            CHECK_BOX1: 'Kontrollkästchengruppe',
-            CHECK_BOX1_ITEM1: 'Punkt 1',
-            CHECK_BOX2: 'Tier auswählen',
-            CHECK_BOX2_ITEM1: 'Hund',
+            CHECK_BOX: 'Kontrollkästchengruppe',
+            CHECK_BOX_ITEM1: 'Punkt 1',
             DATE_INPUT: 'Datumseingabe',
             DROPDOWN: 'Dropdown-Menü',
             EMAIL_INPUT: 'E-Mail-Eingabe',
@@ -88,10 +82,8 @@ const languages = [
         LANGUAGE: 'Japanese', LOCALE: 'ja', TRANSLATION: {
             ACCORDION: 'アコーディオン',
             BUTTON: 'ボタン',
-            CHECK_BOX1: 'チェック ボックス グループ',
-            CHECK_BOX1_ITEM1: 'アイテム1',
-            CHECK_BOX2: '動物を選択',
-            CHECK_BOX2_ITEM1: '犬',
+            CHECK_BOX: 'チェック ボックス グループ',
+            CHECK_BOX_ITEM1: 'アイテム1',
             DATE_INPUT: '日付入力',
             DROPDOWN: 'ドロップダウン',
             EMAIL_INPUT: 'メール入力',
@@ -118,10 +110,8 @@ const languages = [
         LANGUAGE: 'Italian', LOCALE: 'it', TRANSLATION: {
             ACCORDION: 'Fisarmonica',
             BUTTON: 'Bottone',
-            CHECK_BOX1: 'Gruppo di caselle di controllo',
-            CHECK_BOX1_ITEM1: 'Articolo 1',
-            CHECK_BOX2: 'Seleziona animale',
-            CHECK_BOX2_ITEM1: 'Cane',
+            CHECK_BOX: 'Gruppo di caselle di controllo',
+            CHECK_BOX_ITEM1: 'Articolo 1',
             DATE_INPUT: 'Inserimento data',
             DROPDOWN: 'Menù a discesa',
             EMAIL_INPUT: 'Inserisci e-mail',
@@ -148,10 +138,8 @@ const languages = [
         LANGUAGE: 'French', LOCALE: 'fr', TRANSLATION: {
             ACCORDION: 'Accordéon',
             BUTTON: 'Bouton',
-            CHECK_BOX1: 'Groupe de cases à cocher',
-            CHECK_BOX1_ITEM1: 'Point 1 de l’ordre du jour',
-            CHECK_BOX2: 'Sélectionner un animal',
-            CHECK_BOX2_ITEM1: 'Chien',
+            CHECK_BOX: 'Groupe de cases à cocher',
+            CHECK_BOX_ITEM1: 'Point 1 de l’ordre du jour',
             DATE_INPUT: 'Saisie de la date',
             DROPDOWN: 'Liste déroulante',
             EMAIL_INPUT: 'Saisie par e-mail',
@@ -178,10 +166,8 @@ const languages = [
         LANGUAGE: 'Spanish', LOCALE: 'es', TRANSLATION: {
             ACCORDION: 'Acordeón',
             BUTTON: 'Botón',
-            CHECK_BOX1: 'Grupo de casillas de verificación',
-            CHECK_BOX1_ITEM1: 'Tema 1',
-            CHECK_BOX2: 'Seleccionar animal',
-            CHECK_BOX2_ITEM1: 'Perro',
+            CHECK_BOX: 'Grupo de casillas de verificación',
+            CHECK_BOX_ITEM1: 'Tema 1',
             DATE_INPUT: 'Entrada de fecha',
             DROPDOWN: 'Menú desplegable',
             EMAIL_INPUT: 'Entrada de correo electrónico',
@@ -208,10 +194,8 @@ const languages = [
         LANGUAGE: 'Korean', LOCALE: 'ko-kr', TRANSLATION: {
             ACCORDION: '아코디언',
             BUTTON: '단추',
-            CHECK_BOX1: '확인란 그룹',
-            CHECK_BOX1_ITEM1: '항목 1',
-            CHECK_BOX2: '동물 선택',
-            CHECK_BOX2_ITEM1: '개',
+            CHECK_BOX: '확인란 그룹',
+            CHECK_BOX_ITEM1: '항목 1',
             DATE_INPUT: '날짜 입력',
             DROPDOWN: '드롭다운',
             EMAIL_INPUT: '이메일 입력',
@@ -238,10 +222,8 @@ const languages = [
         LANGUAGE: 'Chinese Traditional', LOCALE: 'zh-tw', TRANSLATION: {
             ACCORDION: '手風琴',
             BUTTON: '按鈕',
-            CHECK_BOX1: '複選框組',
-            CHECK_BOX1_ITEM1: '專案1',
-            CHECK_BOX2: '選擇動物',
-            CHECK_BOX2_ITEM1: '狗',
+            CHECK_BOX: '複選框組',
+            CHECK_BOX_ITEM1: '專案1',
             DATE_INPUT: '日期輸入',
             DROPDOWN: '下拉清單',
             EMAIL_INPUT: '電子郵件輸入',
@@ -269,10 +251,8 @@ const languages = [
         LANGUAGE: 'Chinese Simplified', LOCALE: 'zh-cn', TRANSLATION: {
             ACCORDION: '手风琴',
             BUTTON: '按钮',
-            CHECK_BOX1: '复选框组',
-            CHECK_BOX1_ITEM1: '项目1',
-            CHECK_BOX2: '选择动物',
-            CHECK_BOX2_ITEM1: '狗',
+            CHECK_BOX: '复选框组',
+            CHECK_BOX_ITEM1: '项目1',
             DATE_INPUT: '日期输入',
             DROPDOWN: '下拉列表',
             EMAIL_INPUT: '电子邮件输入',
@@ -299,10 +279,8 @@ const languages = [
         LANGUAGE: 'Portuguese', LOCALE: 'pt-br', TRANSLATION: {
             ACCORDION: 'Acordeão',
             BUTTON: 'Botão',
-            CHECK_BOX1: 'Grupo de caixas de seleção',
-            CHECK_BOX1_ITEM1: 'Ponto 1',
-            CHECK_BOX2: 'Selecione Animal',
-            CHECK_BOX2_ITEM1: 'Cão',
+            CHECK_BOX: 'Grupo de caixas de seleção',
+            CHECK_BOX_ITEM1: 'Ponto 1',
             DATE_INPUT: 'Entrada de data',
             DROPDOWN: 'Menu suspenso',
             EMAIL_INPUT: 'Entrada de e-mail',
@@ -330,10 +308,8 @@ const languages = [
         LANGUAGE: 'Russian - Custom Locale added via overlay', LOCALE: 'ru-ru', TRANSLATION: {
             ACCORDION: 'Аккордеон',
             BUTTON: 'Пуговица',
-            CHECK_BOX1: 'Группа флажков',
-            CHECK_BOX1_ITEM1: 'Пункт 1',
-            CHECK_BOX2: 'Выберите животное',
-            CHECK_BOX2_ITEM1: 'Собака',
+            CHECK_BOX: 'Группа флажков',
+            CHECK_BOX_ITEM1: 'Пункт 1',
             DATE_INPUT: 'Ввод даты',
             DROPDOWN: 'Выпадающий список',
             EMAIL_INPUT: 'Ввод электронной почты',
@@ -361,10 +337,8 @@ const languages = [
         LANGUAGE: 'Hindi - Custom Locale added via clientlib', LOCALE: 'hi', TRANSLATION: {
             ACCORDION: 'अकॉर्डियन',
             BUTTON: 'बटन',
-            CHECK_BOX1: 'चेक बॉक्स समूह',
-            CHECK_BOX1_ITEM1: 'आइटम 1',
-            CHECK_BOX2: 'पशु का चयन करें',
-            CHECK_BOX2_ITEM1: 'कुत्ता',
+            CHECK_BOX: 'चेक बॉक्स समूह',
+            CHECK_BOX_ITEM1: 'आइटम 1',
             DATE_INPUT: 'दिनांक इनपुट',
             DROPDOWN: 'ड्रॉपडाउन',
             EMAIL_INPUT: 'ईमेल इनपुट',
diff --git a/ui.tests/test-module/libs/support/commands.js b/ui.tests/test-module/libs/support/commands.js
index 2659356df7..5bd01451ce 100644
--- a/ui.tests/test-module/libs/support/commands.js
+++ b/ui.tests/test-module/libs/support/commands.js
@@ -668,13 +668,3 @@ Cypress.Commands.add("expectNoConsoleErrors", () => {
     });
 });
 
-Cypress.Commands.add("isElementInViewport", { prevSubject: true }, (subject) => {
-    const rect = subject[0].getBoundingClientRect();
-  
-    return (
-      rect.top >= 0 &&
-      rect.left >= 0 &&
-      rect.bottom <= Cypress.config("viewportHeight") &&
-      rect.right <= Cypress.config("viewportWidth")
-    );
-  });
diff --git a/ui.tests/test-module/specs/LocaleTest.spec.js b/ui.tests/test-module/specs/LocaleTest.spec.js
index 99913c4ea4..1dcf13889c 100644
--- a/ui.tests/test-module/specs/LocaleTest.spec.js
+++ b/ui.tests/test-module/specs/LocaleTest.spec.js
@@ -47,7 +47,7 @@ describe('Verify constants are changing for each language', function () {
                 cy.openPage(languageUrl + currentLang).then(waitForLangDataToLoad);
             }
             Object.entries(currLanguage.TRANSLATION).forEach(component => {
-                if(component[0] === 'CHECK_BOX1_ITEM1' || component[0] === 'CHECK_BOX2_ITEM1') {
+                if(component[0] === 'CHECK_BOX_ITEM1') {
                     cy.get(dataSet.selectors[component[0]]).eq(0).invoke('text').should('eq', component[1]);
                 }
                 else {
diff --git a/ui.tests/test-module/specs/accordion/accordion.runtime.spec.js b/ui.tests/test-module/specs/accordion/accordion.runtime.spec.js
index 503431c590..964e930da2 100644
--- a/ui.tests/test-module/specs/accordion/accordion.runtime.spec.js
+++ b/ui.tests/test-module/specs/accordion/accordion.runtime.spec.js
@@ -200,7 +200,6 @@ describe("Form with Accordion Layout Container with focus", () => {
 
             cy.get(`#${firstChildComponentButtonId}`).then(() => {
                 formContainer.setFocus(id);
-                cy.get(`#${firstChildComponentButtonId}`).isElementInViewport().should("eq", true);
                 cy.get(`#${firstChildComponentButtonId}`).then(() => {
                     // panel 1 active
                     cy.get(`#${firstChildComponentButtonId}`).should('have.class', 'cmp-accordion__button--expanded');
diff --git a/ui.tests/test-module/specs/actions/viewQualifiedName/viewQualifiedName.authoring.spec.js b/ui.tests/test-module/specs/actions/viewQualifiedName/viewQualifiedName.authoring.spec.js
deleted file mode 100644
index df55aa6c90..0000000000
--- a/ui.tests/test-module/specs/actions/viewQualifiedName/viewQualifiedName.authoring.spec.js
+++ /dev/null
@@ -1,239 +0,0 @@
-const afConstants = require("../../../libs/commons/formsConstants");
-const sitesSelectors = require("../../../libs/commons/sitesSelectors");
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-describe("View Qualified Name Tests", () => {
-    if (cy.af.isLatestAddon()) {
-        const pagePath = "/content/forms/af/core-components-it/blank",
-            buttonEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/button",
-            buttonEditPathSelector = "[data-path='" + buttonEditPath + "']",
-            buttonDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formbutton.split("/").pop(),
-            checkboxEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/checkboxgroup",
-            checkboxEditPathSelector = "[data-path='" + checkboxEditPath + "']",
-            checkboxDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formcheckboxgroup.split("/").pop(),
-            emailinputEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/emailinput",
-            emailinputEditPathSelector = "[data-path='" + emailinputEditPath + "']",
-            emailinputDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formemailinput.split("/").pop();
-
-        const fileInputEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/fileinput",
-            fileInputEditPathSelector = "[data-path='" + fileInputEditPath + "']",
-            fileInputDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formfileinput.split("/").pop();
-
-        const containerEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/panelcontainer",
-            containerEditPathSelector = "[data-path='" + containerEditPath + "']",
-            containerDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/panelcontainer";
-
-        const accordionEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/accordion",
-            accordionEditPathSelector = "[data-path='" + accordionEditPath + "']",
-            accordionDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/accordion";
-
-        const wizardEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/wizard",
-            wizardEditPathSelector = "[data-path='" + wizardEditPath + "']",
-            wizardDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/wizard";
-
-        const verticaltabsEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/verticaltabs",
-            verticaltabsEditPathSelector = "[data-path='" + verticaltabsEditPath + "']",
-            verticaltabsDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/verticaltabs";
-
-        const tabsontopEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/tabsontop",
-            tabsontopEditPathSelector = "[data-path='" + tabsontopEditPath + "']",
-            tabsontopDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/tabsontop";
-
-        const imageEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/image",
-            imageEditPathSelector = "[data-path='" + imageEditPath + "']",
-            imageDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formimage.split("/").pop();
-
-
-        const dropComponent = function (componentEditPathSelector, dataPath) {
-            const responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
-            cy.selectLayer("Edit");
-            switch (componentEditPathSelector) {
-                case buttonEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Button", afConstants.components.forms.resourceType.formbutton);
-                    break;
-                case checkboxEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form CheckBox Group", afConstants.components.forms.resourceType.formcheckboxgroup);
-                    break;
-                case emailinputEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Email Input", afConstants.components.forms.resourceType.formemailinput);
-                    break;
-                case fileInputEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form File Attachment", afConstants.components.forms.resourceType.formfileinput);
-                    break;
-                case containerEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Panel", afConstants.components.forms.resourceType.panelcontainer);
-                    break;
-                case accordionEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Accordion", afConstants.components.forms.resourceType.accordion);
-                    break;
-                case wizardEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Wizard", afConstants.components.forms.resourceType.wizard);
-                    break;
-                case verticaltabsEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Vertical Tabs", afConstants.components.forms.resourceType.verticaltabs);
-                    break;
-                case tabsontopEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Horizontal Tabs", afConstants.components.forms.resourceType.tabsontop);
-                    break;
-                case imageEditPathSelector:
-                    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Image", afConstants.components.forms.resourceType.formimage);
-                    break;
-            }
-            cy.get('body').click(0, 0);
-        }
-        const sitesDataPath = "/content/core-components-examples/library/adaptive-form/image/jcr:content/root/responsivegrid/demo/component/guideContainer/*";
-        const containerDataPath = "/content/forms/af/core-components-it/blank/jcr:content/guideContainer/*";
-        const submitBtnSelector = ".cq-dialog-submit";
-
-        const dropComponentAndSetName = function (componentEditPathSelector, name, isSites = false) {
-            if (isSites) {
-                dropComponent(componentEditPathSelector, sitesDataPath);
-            } else {
-                dropComponent(componentEditPathSelector, containerDataPath);
-            }
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + componentEditPathSelector);
-            cy.invokeEditableAction("[data-action='CONFIGURE']");
-            cy.get(".cq-dialog").should("be.visible");
-            cy.get("[name='./name']").click().clear().type(name);
-            cy.get(submitBtnSelector).click({force: true});
-        }
-
-        const testQualifiedName = (componentEditPathSelector, componentDrop, isSites) => {
-            const name = "abc"
-            const qualifiedName = `$form.${name}`;
-            dropComponentAndSetName(componentEditPathSelector, name, isSites);
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + componentEditPathSelector);
-            cy.invokeEditableAction("[data-action='qualifiedName']");
-            cy.get('#getQualifiedNameDialog').should('be.visible');
-            cy.get("coral-dialog[id='getQualifiedNameDialog'] coral-dialog-content").contains(qualifiedName)
-
-            cy.get("#getQualifiedNameDialog button[handle='closeButton']").click();
-            cy.deleteComponentByPath(componentDrop);
-        }
-
-        context('Open Forms Editor', function () {
-            beforeEach(function () {
-                // this is done since cypress session results in 403 sometimes
-                cy.openAuthoring(pagePath);
-                cy.on('uncaught:exception', () => {
-                    return false
-                });
-            });
-
-            it('Test Qualified name for Button', {retries: 3}, function () {
-                cy.cleanTest(buttonEditPath).then(function () {
-                    testQualifiedName(buttonEditPathSelector, buttonDrop);
-                });
-            });
-
-            it('Test Qualified for Checkbox', {retries: 3}, function () {
-                cy.cleanTest(checkboxEditPath).then(function () {
-                    testQualifiedName(checkboxEditPathSelector, checkboxDrop);
-                });
-            });
-
-            it('Test Qualified for Email', {retries: 3}, function () {
-                cy.cleanTest(emailinputEditPath).then(function () {
-                    testQualifiedName(emailinputEditPathSelector, emailinputDrop);
-                });
-            });
-
-            it('Test Qualified for Panel', {retries: 3}, function () {
-                cy.cleanTest(containerEditPath).then(function () {
-                    testQualifiedName(containerEditPathSelector, containerDrop);
-                });
-            });
-
-            it('Test Qualified for Accordion', {retries: 3}, function () {
-                cy.cleanTest(accordionEditPath).then(function () {
-                    testQualifiedName(accordionEditPathSelector, accordionDrop);
-                })
-            });
-
-            it('Test Qualified for Wizard', {retries: 3}, function () {
-                cy.cleanTest(wizardEditPath).then(function () {
-                    testQualifiedName(wizardEditPathSelector, wizardDrop);
-                })
-            });
-
-            it('Test Qualified for Vertical tabs', {retries: 3}, function () {
-                cy.cleanTest(verticaltabsEditPath).then(function () {
-                    testQualifiedName(verticaltabsEditPathSelector, verticaltabsDrop);
-                });
-            });
-
-            it('Test Qualified for Tabs on top', {retries: 3}, function () {
-                cy.cleanTest(tabsontopEditPath).then(() => {
-                    testQualifiedName(tabsontopEditPathSelector, tabsontopDrop);
-                });
-            });
-
-            it('Test Qualified for Image', {retries: 3}, function () {
-                cy.cleanTest(imageEditPath).then(() => {
-                    testQualifiedName(imageEditPathSelector, imageDrop);
-                })
-            });
-
-            it('Test Qualified for File Input', {retries: 3}, function () {
-                cy.cleanTest(fileInputEditPath).then(() => {
-                    testQualifiedName(fileInputEditPathSelector, fileInputDrop);
-                })
-            });
-        })
-
-        context('Open Sites Editor', function () {
-            const pagePath = "/content/core-components-examples/library/adaptive-form/accordion",
-                accordionEditPath = pagePath + afConstants.RESPONSIVE_GRID_DEMO_SUFFIX + "/guideContainer/accordion",
-                accordionEditPathSelector = "[data-path='" + accordionEditPath + "']";
-
-            beforeEach(function () {
-                // this is done since cypress session results in 403 sometimes
-                cy.openAuthoring(pagePath);
-            });
-            const dropAccordionInSites = function () {
-                const dataPath = "/content/core-components-examples/library/adaptive-form/accordion/jcr:content/root/responsivegrid/demo/component/guideContainer/*",
-                    responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
-                cy.selectLayer("Edit");
-                cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Accordion", afConstants.components.forms.resourceType.accordion);
-                cy.get('body').click(0, 0);
-            }
-
-            it('Test Qualified name is sites', {retries: 3}, function () {
-                cy.cleanTest(accordionEditPath).then(function () {
-                    const name = "abc"
-                    const qualifiedName = `$form.${name}`;
-
-                    dropAccordionInSites();
-                    cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + accordionEditPathSelector);
-                    cy.invokeEditableAction("[data-action='CONFIGURE']");
-                    cy.get(".cq-dialog").should("be.visible");
-                    cy.get("[name='./name']").click().clear().type(name);
-                    cy.get(submitBtnSelector).click({force: true});
-
-                    cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + accordionEditPathSelector);
-                    cy.invokeEditableAction("[data-action='qualifiedName']");
-                    cy.get('#getQualifiedNameDialog').should('be.visible');
-                    cy.get("coral-dialog[id='getQualifiedNameDialog'] coral-dialog-content").contains(qualifiedName)
-
-                    cy.get("#getQualifiedNameDialog button[handle='closeButton']").click();
-
-                    cy.deleteComponentByPath(accordionEditPath);
-                });
-            });
-
-        });
-    }
-})
\ No newline at end of file
diff --git a/ui.tests/test-module/specs/button/button.authoring.spec.js b/ui.tests/test-module/specs/button/button.authoring.spec.js
index eab78f089c..4f296c882d 100644
--- a/ui.tests/test-module/specs/button/button.authoring.spec.js
+++ b/ui.tests/test-module/specs/button/button.authoring.spec.js
@@ -48,7 +48,7 @@ describe('Button - Authoring', function () {
             .its('0.contentDocument.body').should('not.be.empty')
             .then(cy.wrap)
       }
-
+    
     const testButtonBehaviour = function(buttonEditPathSelector, buttonDrop, isSites) {
         if (isSites) {
             dropButtonInSites();
@@ -115,28 +115,8 @@ describe('Button - Authoring', function () {
                 testButtonBehaviourInilineEdit(buttonEditPathSelector, buttonDrop);
                 cy.deleteComponentByPath(buttonDrop);
             });
-        });
-
-        it('check rich text support for label', function(){
-            dropButtonInContainer();
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + buttonEditPathSelector);
-            cy.invokeEditableAction("[data-action='CONFIGURE']");
-            cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-            // check rich text selector and see if RTE is visible.
-            cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-            cy.get("div[name='richTextTitle']").should('be.visible');
-            cy.get('.cq-dialog-submit').click();
-        });
-
-        it('check rich text inline editor is present', function(){
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + buttonEditPathSelector);
-            cy.invokeEditableAction("[data-action='EDIT']");
-            cy.get(".rte-toolbar").should('be.visible');
-            cy.get('.rte-toolbar-item[title="Close"]').should('be.visible').click();
-            cy.deleteComponentByPath(buttonDrop);
-        });
-    });
+        })
+    })
 
     context('Open Sites Editor', function () {
         const   pagePath = "/content/core-components-examples/library/adaptive-form/button",
diff --git a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.authoring.spec.js b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.authoring.spec.js
index 24fe51fc59..cfe2586070 100644
--- a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.authoring.spec.js
+++ b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.authoring.spec.js
@@ -162,36 +162,8 @@ describe('Page - Authoring', function () {
         cy.deleteComponentByPath(checkBoxGroupDrop);
     });
 
-    it('check rich text support for label', function(){
-        dropCheckBoxGroupInContainer();
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + checkBoxGroupEditPathSelector);
-        cy.invokeEditableAction("[data-action='CONFIGURE']");
-        cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-        // check rich text selector and see if RTE is visible for title.
-        cy.get('.cmp-adaptiveform-base__istitlerichtext').should('exist').click();
-        cy.get("div[name='richTextTitle']").scrollIntoView();
-        cy.get("div[name='richTextTitle']").should('be.visible');
-
-        // check rich text selector and see if RTE is visible for enum names.
-        cy.get(".cmp-adaptiveform-base__richTextEnumNames").first().should('not.be.visible');
-        cy.get('.cmp-adaptiveform-base__areOptionsRichText').should('exist').click();
-        cy.get("div[name='richTextEnumNames']").then(($el) => {
-            $el[0].scrollIntoView();
-        })
-        cy.get("div[name='richTextEnumNames']").first().should('be.visible');
-        cy.get(".cmp-adaptiveform-base__richTextEnumNames").first().should('be.visible');
-        cy.get('.cq-dialog-submit').click();
-    });
 
-    it('check rich text inline editor is present', function(){
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + checkBoxGroupEditPathSelector);
-        cy.invokeEditableAction("[data-action='EDIT']");
-        cy.get(".rte-toolbar").should('be.visible');
-        cy.get('.rte-toolbar-item[title="Close"]').should('be.visible').click();
-        cy.deleteComponentByPath(checkBoxGroupDrop);
-    });
-  });
+  })
 /*
   context('Open Sites Editor', function () {
     const   pagePath = "/content/core-components-examples/library/adaptive-form/textinput",
diff --git a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.spec.js b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.spec.js
index aac3d003c6..def53c1af7 100644
--- a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.spec.js
+++ b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.spec.js
@@ -190,14 +190,6 @@ describe("Form Runtime with CheckBoxGroup Input", () => {
 
     })
 
-    it("rich text should render correctly", () => {
-        const [checkBox7, checkBox7FieldView] = Object.entries(formContainer._fields)[6];
-        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup-item").should('have.length', 2);
-        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__label").contains('Select Animal').should('have.css', 'font-weight', '700');
-        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__option-label span").contains('Dog').should('have.css', 'font-style', 'italic');
-        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__option-label span").contains('Cat').should('have.css', 'text-decoration', 'underline solid rgb(50, 50, 50)');
-    });
-
     it("decoration element should not have same class name", () => {
         expect(formContainer, "formcontainer is initialized").to.not.be.null;
         cy.wrap().then(() => {
diff --git a/ui.tests/test-module/specs/emailinput/emailinput.runtime.spec.js b/ui.tests/test-module/specs/emailinput/emailinput.runtime.spec.js
index d353dbb2a2..b74ec05cca 100644
--- a/ui.tests/test-module/specs/emailinput/emailinput.runtime.spec.js
+++ b/ui.tests/test-module/specs/emailinput/emailinput.runtime.spec.js
@@ -84,17 +84,9 @@ describe("Form Runtime with Email Input", () => {
 
     it(" Invalid email ID generates error message ", () => {
         const [id, fieldView] = Object.entries(formContainer._fields)[0]
-        const notAllowed = "invalidEmail"
-        cy.get(`#${id}`).find("input").clear().type(notAllowed).blur().then(x => {
-            cy.get('.cmp-adaptiveform-emailinput__errormessage').should('be.visible');
-        })
-        const invalidEmailPattern = "invalidEmail@domain"
-        cy.get(`#${id}`).find("input").clear().type(invalidEmailPattern).blur().then(x => {
-            cy.get('.cmp-adaptiveform-emailinput__errormessage').should('be.visible');
-        })
-        const validEmailPattern = "validEmail@domain.com"
-        cy.get(`#${id}`).find("input").clear().type(validEmailPattern).blur().then(x => {
-            cy.get('.cmp-adaptiveform-emailinput__errormessage').should('not.be.visible');
+        const input = "invalidEmail"
+        cy.get(`#${id}`).find("input").clear().type(input).blur().then(x => {
+            cy.get('.cmp-adaptiveform-emailinput__errormessage').should('exist');
         })
     });
 
diff --git a/ui.tests/test-module/specs/embedFormsInSite/embedFormsInSite.runtime.spec.js b/ui.tests/test-module/specs/embedFormsInSite/embedFormsInSite.runtime.spec.js
deleted file mode 100644
index 5c762033f9..0000000000
--- a/ui.tests/test-module/specs/embedFormsInSite/embedFormsInSite.runtime.spec.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-describe("Embed multiple form in site", () => {
-
-  context('Forms inside site', function () {
-
-    before(() => {
-      cy.attachConsoleErrorSpy();
-    });
-
-    const pagePath = "/content/forms/sites/core-components-it/aemembedmutipleform.html";
-    let formContainer = [];
-
-    beforeEach(function () {
-        cy.previewForm(pagePath, {multipleContainers: true}).then(p => {
-            formContainer = p;
-        })
-    })
-
-    const checkHTML = (id, state) => {
-      const visible = state.visible;
-      const passVisibleCheck = `${visible === true ? "" : "not."}be.visible`;
-      const passDisabledAttributeCheck = `${state.enabled === false ? "" : "not."}have.attr`;
-      const value = state.value == null ? '' : state.value;
-      cy.get(`#${id}`)
-          .should(passVisibleCheck)
-          .invoke('attr', 'data-cmp-visible')
-          .should('eq', visible.toString());
-      cy.get(`#${id}`)
-          .invoke('attr', 'data-cmp-enabled')
-          .should('eq', state.enabled.toString());
-      return cy.get(`#${id}`).within((root) => {
-          cy.get('*').should(passVisibleCheck)
-          cy.get('input')
-              .should(passDisabledAttributeCheck, 'disabled');
-          cy.get('input').should('have.value', value)
-      })
-    }
-
-    it("should render three form", () => {
-      expect(formContainer.length).to.equal(3);
-    });
-
-    it("form 1 model initialized properly", () => {
-        expect(formContainer[0], "formcontainer is initialized").to.not.be.null;
-        expect(Object.keys(formContainer[0]._fields).length).to.equal(11);
-    });
-
-    it("form 2 model initialized properly", () => {
-      expect(formContainer[1], "formcontainer is initialized").to.not.be.null;
-      expect(Object.keys(formContainer[1]._fields).length).to.equal(4);
-    });
-
-    it(" model's changes are reflected in the html  for form1", () => {
-      const [id, fieldView] = Object.entries(formContainer[0]._fields)[0]
-      const model = formContainer[0]._model.getElement(id)
-      model.value = "some other value"
-      checkHTML(model.id, model.getState()).then(() => {
-          model.visible = false
-          return checkHTML(model.id, model.getState())
-      }).then(() => {
-          model.enabled = false
-          return checkHTML(model.id, model.getState())
-      })
-      cy.expectNoConsoleErrors();
-    });
-
-    it(" model's changes are reflected in the html for form 2", () => {
-      const [id, fieldView] = Object.entries(formContainer[1]._fields)[0]
-      const model = formContainer[1]._model.getElement(id)
-      model.value = "some other value"
-      checkHTML(model.id, model.getState()).then(() => {
-          model.visible = false
-          return checkHTML(model.id, model.getState())
-      }).then(() => {
-          model.enabled = false
-          return checkHTML(model.id, model.getState())
-      })
-  });
-
-  it("testing add/remove instance for wizard", () => {
-    cy.get(".cmp-adaptiveform-wizard__tab").should('have.length', 4);
-    cy.get(".cmp-adaptiveform-wizard__wizardpanel").should('have.length', 4);
-    cy.get("button").contains("+R1").click().then(() => {
-        cy.get(".cmp-adaptiveform-wizard__tab").should('have.length', 5);
-        cy.get(".cmp-adaptiveform-wizard__wizardpanel").should('have.length', 5);
-        cy.get("button").contains("-R1").click().then(() => {
-            cy.get(".cmp-adaptiveform-wizard__tab").should('have.length', 4);
-            cy.get(".cmp-adaptiveform-wizard__wizardpanel").should('have.length', 4);
-            cy.get("button").contains("-R1").click().then(() => {
-                cy.get(".cmp-adaptiveform-wizard__tab").should('have.length', 3);
-                cy.get(".cmp-adaptiveform-wizard__wizardpanel").should('have.length', 3);
-            })
-        })
-    })
-    cy.expectNoConsoleErrors();
-  })
-
-})
-})
\ No newline at end of file
diff --git a/ui.tests/test-module/specs/image/image.authoring.spec.js b/ui.tests/test-module/specs/image/image.authoring.spec.js
index ea120cdb9a..47ec438a7b 100644
--- a/ui.tests/test-module/specs/image/image.authoring.spec.js
+++ b/ui.tests/test-module/specs/image/image.authoring.spec.js
@@ -77,19 +77,8 @@ describe('Page - Authoring', function () {
 
     it ('open edit dialog of Image', function(){
       testImageBehaviour(imageEditPathSelector, imageDrop);
-    });
-
-    it('check rich text support for label', function(){
-      dropImageInContainer();
-      cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + imageEditPathSelector);
-      cy.invokeEditableAction("[data-action='CONFIGURE']");
-      //rich text shouldn't be present in image component
-      cy.get("div[name='richTextTitle']").should('not.exist');
-      cy.get('.cmp-adaptiveform-base__istitlerichtext').should('not.exist');
-      cy.get('.cq-dialog-cancel').click();
-      cy.deleteComponentByPath(imageDrop);
-    });
-  });
+    })
+  })
 
   context('Open Sites Editor', function () {
     const pagePath = "/content/core-components-examples/library/adaptive-form/image",
diff --git a/ui.tests/test-module/specs/panelcontainer/panelcontainer.authoring.spec.js b/ui.tests/test-module/specs/panelcontainer/panelcontainer.authoring.spec.js
index b1473b7167..ef37b396f4 100644
--- a/ui.tests/test-module/specs/panelcontainer/panelcontainer.authoring.spec.js
+++ b/ui.tests/test-module/specs/panelcontainer/panelcontainer.authoring.spec.js
@@ -94,20 +94,7 @@ describe('Page - Authoring', function () {
 
         it('open edit dialog of Panel', function () {
             testPanelBehaviour(panelContainerPathSelector, panelEditPath);
-        });
-
-        it('check rich text support for label', function(){
-            dropPanelInContainer();
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + panelContainerPathSelector);
-            cy.invokeEditableAction("[data-action='CONFIGURE']");
-            cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-            // check rich text selector and see if RTE is visible.
-            cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-            cy.get("div[name='richTextTitle']").should('be.visible');
-            cy.get('.cq-dialog-cancel').click();
-            cy.deleteComponentByPath(panelEditPath);
-        });
+        })
     })
 
     context('Open Sites Editor', function () {
diff --git a/ui.tests/test-module/specs/radiobutton/radiobutton.authoring.spec.js b/ui.tests/test-module/specs/radiobutton/radiobutton.authoring.spec.js
index 84e97b2bd3..07fed297b8 100644
--- a/ui.tests/test-module/specs/radiobutton/radiobutton.authoring.spec.js
+++ b/ui.tests/test-module/specs/radiobutton/radiobutton.authoring.spec.js
@@ -103,26 +103,6 @@ describe('Page - Authoring', function () {
         });
     });
 
-    it('check rich text support for label', function(){
-        dropRadioButtonInGuideContainer();
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + radioButtonEditPathSelector);
-        cy.invokeEditableAction("[data-action='CONFIGURE']");
-        cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-        // check rich text selector and see if RTE is visible.
-        cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-        cy.get("div[name='richTextTitle']").scrollIntoView().should('be.visible');
-        cy.get('.cq-dialog-submit').click();
-    });
-
-    it('check rich text inline editor is present', function(){
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + radioButtonEditPathSelector);
-        cy.invokeEditableAction("[data-action='EDIT']");
-        cy.get(".rte-toolbar").should('be.visible');
-        cy.get('.rte-toolbar-item[title="Close"]').should('be.visible').click();
-        cy.deleteComponentByPath(radioButtonDrop);
-    });
-
     it ('check value type validations', function() {
         cy.cleanTest(radioButtonDrop).then(function() {
             // For Number Type
diff --git a/ui.tests/test-module/specs/replaceaction/replacelayout-container.authoring.spec.js b/ui.tests/test-module/specs/replaceaction/replacelayout-container.authoring.spec.js
index 1a25f58d59..299b6d6fb4 100644
--- a/ui.tests/test-module/specs/replaceaction/replacelayout-container.authoring.spec.js
+++ b/ui.tests/test-module/specs/replaceaction/replacelayout-container.authoring.spec.js
@@ -21,7 +21,7 @@ const sitesSelectors = require('../../libs/commons/sitesSelectors'),
  * Testing Form Component replace behaviour in authoring
  */
 describe('component replace - Authoring', function () {
-    const fieldTypes = {TEXT: 'text', SELECT: 'select', NON_INPUT: 'nonInputReadOnly', CHECKBOX: 'checkbox'}
+    const fieldTypes = {TEXT: 'text', SELECT: 'select', NON_INPUT: 'nonInputReadOnly'}
     const typeMap = {
         "formbutton": fieldTypes.NON_INPUT,
         "formcheckboxgroup": fieldTypes.SELECT,
@@ -34,9 +34,7 @@ describe('component replace - Authoring', function () {
         "formtext": fieldTypes.NON_INPUT,
         "formtextinput": fieldTypes.TEXT,
         "title": fieldTypes.NON_INPUT,
-        "formimage": fieldTypes.NON_INPUT,
-        "checkbox": fieldTypes.CHECKBOX,
-        "switch": fieldTypes.CHECKBOX
+        "formimage": fieldTypes.NON_INPUT
     }
     const pagePath = "/content/forms/af/core-components-it/blank",
         buttonEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/button",
@@ -45,6 +43,7 @@ describe('component replace - Authoring', function () {
         checkboxEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/checkboxgroup",
         checkboxEditPathSelector = "[data-path='" + checkboxEditPath + "']",
         checkboxDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formcheckboxgroup.split("/").pop(),
+        dataPath = "/content/core-components-examples/library/adaptive-form/emailinput/jcr:content/root/responsivegrid/demo/component/guideContainer/*",
         emailinputEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/emailinput",
         emailinputEditPathSelector = "[data-path='" + emailinputEditPath + "']",
         emailinputDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formemailinput.split("/").pop();
@@ -160,7 +159,7 @@ describe('component replace - Authoring', function () {
             testComponentReplaceBehaviour(buttonEditPathSelector, buttonDrop);
         })
 
-        it('replace checkbox with switch', function () {
+        it('replace checkbox with radio button', function () {
             testComponentReplaceBehaviour(checkboxEditPathSelector, checkboxDrop);
         })
 
diff --git a/ui.tests/test-module/specs/setFocusTests.runtime.spec.js b/ui.tests/test-module/specs/setFocusTests.runtime.spec.js
deleted file mode 100644
index d96a8ae034..0000000000
--- a/ui.tests/test-module/specs/setFocusTests.runtime.spec.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-describe("Form with multipe components", () => {
-
-    const pagePath = "content/forms/af/core-components-it/samples/setfocus.html";
-    let formContainer = null
-
-
-    beforeEach(() => {
-        cy.previewForm(pagePath).then(p => {
-            formContainer = p;
-        })
-    });
-
-    const checkHTML = (id, state, view, count) => {
-        const visible = state.visible;
-        const passVisibleCheck = `${visible === true ? "" : "not."}be.visible`;
-        cy.get(`#${id}`)
-            .should(passVisibleCheck)
-            .invoke('attr', 'data-cmp-visible')
-            .should('eq', visible.toString());
-        cy.get(`#${id}`)
-            .invoke('attr', 'data-cmp-enabled')
-            .should('eq', state.enabled.toString());
-        expect(state.items.length, "model has children equal to count").to.equal(count);
-        if (count == 0) {
-            return cy.get(`.${childBemBlock}`).should('not.exist');
-        } else {
-            return cy.get(`.${childBemBlock}`).should('have.length', count);
-        }
-    };
-
-    it("check if first tab activated if focus call from other tab", () => {
-        const firstChildComponentId = formContainer._model.items[7].items[1].items[0].id;
-        const firstChildComponentButtonId = formContainer._model.items[0].id ;
-                cy.get(`#${firstChildComponentButtonId}`).click();
-                cy.get(`#${firstChildComponentId}`).isElementInViewport().should("eq", true);
-            })
-        
-   
-})
\ No newline at end of file
diff --git a/ui.tests/test-module/specs/switch/switch.authoring.spec.js b/ui.tests/test-module/specs/switch/switch.authoring.spec.js
deleted file mode 100644
index be8670934b..0000000000
--- a/ui.tests/test-module/specs/switch/switch.authoring.spec.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  Copyright 2023 Adobe Systems Incorporated
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-
-const sitesSelectors = require('../../libs/commons/sitesSelectors'),
-    afConstants = require('../../libs/commons/formsConstants');
-
-/**
- * Testing Switch with Sites Editor
- */
-describe('Page - Authoring', function () {
-
-
-  const dropSwitchInSites = function() {
-    const dataPath = "/content/core-components-examples/library/adaptive-form/switch/jcr:content/root/responsivegrid/demo/component/guideContainer/*",
-        responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
-    cy.selectLayer("Edit");
-    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Switch", afConstants.components.forms.resourceType.switch);
-    cy.get('body').click( 0,0);
-  };
-
-  const dropSwitchInContainer = function() {
-    const dataPath = "/content/forms/af/core-components-it/blank/jcr:content/guideContainer/*",
-        responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
-    cy.selectLayer("Edit");
-    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Switch", afConstants.components.forms.resourceType.switch);
-    cy.get('body').click(0, 0);
-  }
-
-  const testSwitchBehaviour = function (switchEditPathSelector, switchDrop, isSites) {
-    if (isSites) {
-      dropSwitchInSites();
-    } else {
-      dropSwitchInContainer();
-    }
-    cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + switchEditPathSelector);
-    cy.invokeEditableAction("[data-action='CONFIGURE']");
-    cy.get("[name='./name']")
-    .should("exist");
-
-    cy.get('.cq-dialog-cancel').click();
-    cy.deleteComponentByPath(switchDrop);
-  }
-
-  context('Open Forms Editor', function() {
-    const pagePath = "/content/forms/af/core-components-it/blank",
-
-        switchEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/switch",
-        switchEditPathSelector = "[data-path='" + switchEditPath + "']",
-        switchDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.switch.split("/").pop();
-
-    beforeEach(function () {
-      // this is done since cypress session results in 403 sometimes
-      cy.openAuthoring(pagePath);
-    });
-
-    it('insert Switch in form container', function () {
-      dropSwitchInContainer();
-      cy.deleteComponentByPath(switchDrop);
-    });
-
-    it('when enableUnchecked is false hides off field', {retries: 3}, function () {
-      cy.cleanTest(switchDrop).then(() => {
-        dropSwitchInContainer();
-        const pagePath = "/content/forms/af/core-components-it/blank",
-            switchEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/switch",
-            switchEditPathSelector = "[data-path='" + switchEditPath + "']";
-        cy.get(switchEditPathSelector).click();
-        cy.invokeEditableAction("[data-action='CONFIGURE']"); // this line is causing frame busting which is causing cypress to fail
-        cy.get(".cmp-adaptiveform-switch__enums coral-multifield-item").eq(1).should('not.be.visible')
-        const enableUnchecked = '[name="./enableUncheckedValue"]';
-        cy.get(enableUnchecked).eq(0).click().then(() => {
-          cy.get(".cmp-adaptiveform-switch__enums coral-multifield-item-content label").eq(3).scrollIntoView().should('be.visible');
-        })
-        cy.get('.cq-dialog-cancel').click();
-        cy.deleteComponentByPath(switchDrop);
-      });
-    });
-
-    it('open edit dialog of aem forms Switch', {retries: 3}, function() {
-      cy.cleanTest(switchDrop).then(() => {
-        testSwitchBehaviour(switchEditPathSelector, switchDrop, false);
-      });
-    });
-  })
-
-  context('Open Sites Editor', function() {
-    const pagePath = "/content/core-components-examples/library/adaptive-form/switch",
-        switchEditPath = pagePath + afConstants.RESPONSIVE_GRID_DEMO_SUFFIX + "/guideContainer/switch",
-        switchDrop = pagePath + afConstants.RESPONSIVE_GRID_DEMO_SUFFIX + '/guideContainer/' + afConstants.components.forms.resourceType.switch.split("/").pop(),
-    switchEditPathSelector = "[data-path='" + switchEditPath + "']";
-
-    beforeEach(function () {
-      // this is done since cypress session results in 403 sometimes
-      cy.openAuthoring(pagePath);
-    });
-
-    it('insert aem forms Switch', function () {
-      dropSwitchInSites();
-      cy.deleteComponentByPath(switchDrop);
-    });
-
-    it('when enableUnchecked is false hides off field', {retries: 3}, function () {
-      cy.cleanTest(switchDrop).then(() => {
-        dropSwitchInSites();
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + switchEditPathSelector);
-        cy.invokeEditableAction("[data-action='CONFIGURE']"); // this line is causing frame busting which is causing cypress to fail
-        cy.get(".cmp-adaptiveform-switch__enums coral-multifield-item").eq(1).should('not.be.visible');
-        const enableUnchecked = '[name="./enableUncheckedValue"]';
-        cy.get(enableUnchecked).eq(0).click().then(() => {
-          cy.get(".cmp-adaptiveform-switch__enums coral-multifield-item-content label").eq(3).scrollIntoView().should('be.visible');
-          cy.get('.cq-dialog-cancel').click();
-          cy.deleteComponentByPath(switchDrop);
-        })
-
-      })
-    });
-
-    it('open edit dialog of aem forms switch', {retries: 3}, function() {
-      cy.cleanTest(switchDrop).then(() => {
-        testSwitchBehaviour(switchEditPathSelector, switchDrop, true);
-      });
-    });
-  })
-});
diff --git a/ui.tests/test-module/specs/switch/switch.runtime.spec.js b/ui.tests/test-module/specs/switch/switch.runtime.spec.js
deleted file mode 100644
index b4bf6b7135..0000000000
--- a/ui.tests/test-module/specs/switch/switch.runtime.spec.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright 2023 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-describe("Form Runtime with Switch Input", () => {
-
-    const pagePath = "content/forms/af/core-components-it/samples/switch/basic.html"
-    const bemBlock = "cmp-adaptiveform-switch"
-
-    let formContainer = null
-
-    beforeEach(() => {
-        cy.previewForm(pagePath).then(p => {
-            formContainer = p;
-        })
-    });
-
-    const checkHTML = (id, state) => {
-        const visible = state.visible;
-        const passVisibleCheck = `${visible === true ? "" : "not."}be.visible`;
-        const passDisabledAttributeCheck = `${state.enabled === false || state.readOnly === true ? "" : "not."}have.attr`;
-        const value = state.value
-        cy.get(`#${id}`)
-            .should(passVisibleCheck)
-            .invoke('attr', 'data-cmp-visible')
-            .should('eq', visible.toString());
-
-        cy.get(`#${id}`)
-            .invoke('attr', 'data-cmp-enabled')
-            .should('eq', state.enabled.toString());
-
-        return cy.get(`#${id}`).within((root) => {
-            cy.get('*').should(passVisibleCheck)
-            cy.get('input')
-                .should('have.length', 1)
-            cy.get('input')
-                .should(passDisabledAttributeCheck, 'disabled');
-            cy.get('input').should('be.checked');
-        })
-    }
-
-    it(" should get model and view initialized properly ", () => {
-        expect(formContainer, "formcontainer is initialized").to.not.be.null;
-        expect(formContainer._model.items.length, "model and view elements match").to.equal(Object.keys(formContainer._fields).length);
-        Object.entries(formContainer._fields).forEach(([id, field]) => {
-            expect(field.getId()).to.equal(id)
-            expect(formContainer._model.getElement(id), `model and view are in sync`).to.equal(field.getModel())
-        });
-    })
-
-    it(" model's changes are reflected in the html ", () => {
-        const id = formContainer._model.items[0].id;
-        const model = formContainer._model.getElement(id)
-        model.value = '0'
-
-        checkHTML(model.id, model.getState()).then(() => {
-            return checkHTML(model.id, model.getState())
-        }).then(() => {
-            model.enable = false
-            return checkHTML(model.id, model.getState())
-        })
-    });
-
-    it('should have initial value "undefined" if no default set', () => {
-        const id = formContainer._model.items[0].id;
-        const model = formContainer._model.getElement(id)
-        expect(model.getState().value).eq(undefined)
-    })
-
-    it ('should have value set to false if checked and then unchecked', () => {
-        const id = formContainer._model.items[0].id;
-        const model = formContainer._model.getElement(id)
-        cy.get(`#${id}`).find("input").click().then(() => {
-            cy.get(`#${id}`).find("input").click().then(() => {
-                expect(model.getState().value).eq(undefined)
-            })
-        })
-
-    })
-
-    it('should have value set to default during initial render', () => {
-        const id = formContainer._model.items[1].id;
-        const model = formContainer._model.getElement(id)
-        expect(model.getState().value).to.contain('0');
-        cy.get(`#${id}`).get('input').should('be.checked');
-    })
-
-    it(" html changes are reflected in model ", () => {
-
-        const id = formContainer._model.items[0].id;
-        const model = formContainer._model.getElement(id)
-        cy.get(`#${id}`).find("input").click().then(x => {
-            expect(model.getState().value).to.contain('0');
-        })
-
-        cy.get(`#${id}`).find("input").click().then(x => {
-            expect(model.getState().value).equal(undefined);
-        })
-    });
-
-    it(" should show error messages in the HTML ", () => {
-        const id = formContainer._model.items[2].id;
-        const model = formContainer._model.getElement(id)
-
-        cy.get(`#${id}`).find("input").click().then(x => {
-            expect(model.getState().value).to.contain('0');
-        })
-
-        cy.get(`#${id}`).find("input").click().then(x => {
-            cy.get(`#${id}`).find(".cmp-adaptiveform-switch__errormessage").should('have.text',"This is a custom required switch")
-        })
-
-        cy.get(`#${id}`).find("input").click().then(x => {
-            cy.get(`#${id}`).find(".cmp-adaptiveform-switch__errormessage").should('have.text',"")
-        })
-    });
-
-    it("should toggle description and tooltip", () => {
-        const id = formContainer._model.items[0].id;
-        cy.toggleDescriptionTooltip(bemBlock, id);
-    })
-
-    it("should show and hide components on certain switch input", () => {
-        // Rule on switch4: When switch4 is ON => Show switch5 and
-        // hide switch5 when switch4 is OFF
-
-        const ruleSwitch = formContainer._model.items[3].id;
-        const hiddenCB = formContainer._model.items[4].id;
-
-        cy.get(`#${hiddenCB}`).should('not.be.visible');
-
-        cy.get(`#${ruleSwitch}`).find('input').click().then(x => {
-            cy.get(`#${hiddenCB}`).should('be.visible');
-            cy.get(`#${ruleSwitch}`).find('input').click().then(x => {
-                cy.get(`#${hiddenCB}`).should('not.be.visible')
-            });
-        });
-
-    })
-
-    it("should enable and disable components on certain switch input", () => {
-        // Rule on switch enabledisable: When switch 'enabledisable' is ON => Enable switch cb5
-        // and hide cb5 when enabledisable is OFF
-
-        const enabledisablecb = formContainer._model.items[5].id;
-        const cbUnderTest = formContainer._model.items[6].id;
-
-        // Initially cb should be disabled
-        cy.get(`#${cbUnderTest}`).find("input").should('not.be.enabled')
-
-        // check to enable cb
-        cy.get(`#${enabledisablecb}`).find("input").click().then(x => {
-            cy.get(`#${cbUnderTest}`).find("input").should('be.enabled')
-            // uncheck to disable cb
-            cy.get(`#${enabledisablecb}`).find("input").click().then(x => {
-                cy.get(`#${cbUnderTest}`).find("input").should('not.be.enabled')
-
-            })
-        })
-    })
-})
diff --git a/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js b/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js
deleted file mode 100644
index e18919fb8b..0000000000
--- a/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright 2022 Adobe Systems Incorporated
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-
-const sitesSelectors = require('../../libs/commons/sitesSelectors'),
-    afConstants = require('../../libs/commons/formsConstants');
-
-/**
- * Testing Terms and Conditions with Sites Editor
- */
-describe('Page - Authoring', function () {
-
-
-  const dropTnCInSites = function() {
-    const dataPath = "/content/core-components-examples/library/adaptive-form/termsandconditions/jcr:content/root/responsivegrid/demo/component/guideContainer/*",
-        responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
-    cy.selectLayer("Edit");
-    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Terms And Conditions", afConstants.components.forms.resourceType.termsandconditions);
-    cy.get('body').click( 0,0);
-  };
-
-  const dropTncInContainer = function() {
-    const dataPath = "/content/forms/af/core-components-it/blank/jcr:content/guideContainer/*",
-        responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
-    cy.selectLayer("Edit");
-    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Terms And Conditions", afConstants.components.forms.resourceType.termsandconditions);
-    cy.get('body').click(0, 0);
-  }
-
-  const testTncBehaviour = function (tncEditPathSelector, tncDrop, isSites) {
-    if (isSites) {
-      dropTnCInSites();
-    } else {
-      dropTncInContainer();
-    }
-    cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + tncEditPathSelector);
-    cy.invokeEditableAction("[data-action='CONFIGURE']"); // this line is causing frame busting which is causing cypress to fail
-    cy.get("[name='./name']")
-    .should("exist");
-
-    cy.get("coral-checkbox[name='./showApprovalOption']")
-      .should('have.attr', 'checked');
-
-    cy.get("input[name='./showApprovalOption']")
-      .click().then(e => {
-      cy.get("input[name='./showAsPopup']").click()
-        .then(e => {
-          cy.get("coral-checkbox[name='./showApprovalOption']")
-          .should('have.attr', 'checked');
-        })
-    });
-
-    cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-    cy.get("div[name='richTextTitle']").should('be.visible');
-
-    cy.get('.cq-dialog-cancel').click();
-    cy.deleteComponentByPath(tncDrop);
-  }
-
-  // ***** //
-
-  context('Open Forms Editor', function() {
-    const pagePath = "/content/forms/af/core-components-it/blank",
-        tncEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/termsandconditions",
-        tncEditPathSelector = "[data-path='" + tncEditPath + "']",
-        tncDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.termsandconditions.split("/").pop();
-
-    beforeEach(function () {
-      // this is done since cypress session results in 403 sometimes
-      cy.openAuthoring(pagePath);
-    });
-
-    it('insert TnC in form container', function () {
-      dropTncInContainer();
-      cy.deleteComponentByPath(tncDrop);
-    });
-
-    it('Test TnC authoring behaviour', function() {
-      testTncBehaviour(tncEditPathSelector, tncDrop, false);
-    });
-  })
-
-  context('Open Sites Editor', function() {
-    const pagePath = "/content/core-components-examples/library/adaptive-form/termsandconditions",
-        tncEditPath = pagePath + afConstants.RESPONSIVE_GRID_DEMO_SUFFIX + "/guideContainer/termsandconditions",
-        tncDrop = pagePath + afConstants.RESPONSIVE_GRID_DEMO_SUFFIX + '/guideContainer/' + afConstants.components.forms.resourceType.termsandconditions.split("/").pop(),
-        tncEditPathSelector = "[data-path='" + tncEditPath + "']";
-
-    beforeEach(function () {
-      // this is done since cypress session results in 403 sometimes
-      cy.openAuthoring(pagePath);
-    });
-
-    it('insert aem forms TnC', function () {
-      dropTnCInSites();
-      cy.deleteComponentByPath(tncDrop);
-    });
-
-    it('Test TnC authoring behaviour', function() {
-      testTncBehaviour(tncEditPathSelector, tncDrop, true);
-    });
-  })
-});
diff --git a/ui.tests/test-module/specs/termsandconditions/tnc.runtime.spec.js b/ui.tests/test-module/specs/termsandconditions/tnc.runtime.spec.js
deleted file mode 100644
index 017b060a3f..0000000000
--- a/ui.tests/test-module/specs/termsandconditions/tnc.runtime.spec.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright 2022 Adobe
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-describe("Form Runtime with Terms and Conditions", () => {
-
-    const pagePath = "content/forms/af/core-components-it/samples/termsandconditions/basic.html",
-        externalPagePathSubmit="content/forms/af/core-components-it/samples/termsandconditions/submissiontest.html"
-    const bemBlock = 'cmp-adaptiveform-termsandcondition'
-    const IS = "adaptiveFormTermsAndConditions"
-    const selectors = {
-        tnc : `[data-cmp-is="${IS}"]`
-    }
-
-    let formContainer = null
-
-    beforeEach(() => {
-        cy.previewForm(pagePath).then(p => {
-            formContainer = p;
-        })
-    });
-
-    const checkHTML = (id, state, view, count) => {
-        const visible = state.visible;
-        const passVisibleCheck = `${visible === true ? "" : "not."}be.visible`;
-        cy.get(`#${id}`)
-        .should(passVisibleCheck)
-        .invoke('attr', 'data-cmp-visible')
-        .should('eq', visible.toString());
-        cy.get(`#${id}`)
-        .invoke('attr', 'data-cmp-enabled')
-        .should('eq', state.enabled.toString());
-        expect(state.items.length, "model has children equal to count").to.equal(2);
-        expect(view.children.length, "tab has children equal to count").to.equal(2); // this is because at any given point, either links are shown or text content is shown
-        return cy.get(`#${id}`);
-    };
-
-    it(" should get model and view initialized properly and parent child relationship is set ", () => {
-        expect(formContainer, "formcontainer is initialized").to.not.be.null;
-        const fields = formContainer.getAllFields();
-        Object.entries(fields).forEach(([id, field]) => {
-            expect(field.getId()).to.equal(id);
-            expect(formContainer._model.getElement(id), `model and view are in sync`).to.equal(field.getModel());
-        });
-    });
-
-    it(" model's changes are reflected in the html ", () => {
-        const tncId = formContainer._model.items[0].id
-        const model = formContainer._model.getElement(tncId)
-        const tabView = formContainer.getAllFields()[tncId];
-        const count = 2;
-        checkHTML(model.id, model.getState(), tabView, count).then(() => {
-            model.visible = false;
-            return checkHTML(model.id, model.getState(), tabView, count);
-        }).then(() => {
-            model.enable = false;
-            return checkHTML(model.id, model.getState(), tabView, count);
-        });
-    });
-
-
-    it("OOTB behaviour -> should enable approval checkbox only if links visited", () => {
-        const tncWithLinksID = formContainer._model.items[1].id;
-        const model = formContainer._model.getElement(tncWithLinksID)
-        expect(model.getState().items[0].enabled).to.equal(false);
-        cy.get(`#${tncWithLinksID}`).get('a').click()
-        .then(() => {
-            expect(model.getState().items[0].enabled).to.equal(true);
-        })
-
-    });
-
-    it("OOTB behaviour -> should have show popup", () => {
-        const tncWithPopup = formContainer._model.items[2].id;
-        const model = formContainer._model.getElement(tncWithPopup)
-        cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__content-container`)
-        .should('have.class', 'cmp-adaptiveform-termsandcondition__content-container--modal')
-        .invoke('attr', 'data-cmp-visible').should('eq', 'false')
-        expect(model.getState().items[1].enabled).to.equal(false);
-        cy.get(`#${tncWithPopup} .cmp-adaptiveform-checkbox__widget-container label`).click()
-        .then(() => {
-            // this test will also verify scrollDone scenario
-            cy.get(`#${tncWithPopup} .cmp-adaptiveform-checkbox`).invoke('attr', 'data-cmp-enabled')
-            .should('eq', 'true')
-
-            cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__content-container`)
-            .invoke('attr', 'data-cmp-visible').should('not.exist');
-            cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__close-button`).click()
-            .then(() => {
-                cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__content-container`)
-                .invoke('attr', 'data-cmp-visible').should('eq', 'false', );
-            })
-        })
-    });
-})
-
diff --git a/ui.tests/test-module/specs/textinput/textinput.authoring.spec.js b/ui.tests/test-module/specs/textinput/textinput.authoring.spec.js
index f8799b436d..e2a6490d7e 100644
--- a/ui.tests/test-module/specs/textinput/textinput.authoring.spec.js
+++ b/ui.tests/test-module/specs/textinput/textinput.authoring.spec.js
@@ -65,29 +65,6 @@ describe('Page - Authoring', function () {
         })
     }
 
-    const testRichTextDialog = function (textInputEditPathSelector, textInputDrop, isSites) {
-        if (isSites) {
-            dropTextInputInSites();
-        } else {
-            dropTextInputInContainer();
-        }
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textInputEditPathSelector);
-        cy.invokeEditableAction("[data-action='CONFIGURE']");
-        cy.get("div[name='richTextTitle']").should('not.be.visible');
-
-        // check rich text selector and see if RTE is visible.
-        cy.get('.cmp-adaptiveform-base__istitlerichtext').should('be.visible').click();
-        cy.get("div[name='richTextTitle']").scrollIntoView().should('be.visible');
-        cy.get('.cq-dialog-submit').click();
-        cy.reload();
-
-        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textInputEditPathSelector);
-        cy.invokeEditableAction("[data-action='EDIT']");
-        cy.get(".rte-toolbar").should('be.visible');
-        cy.get('.rte-toolbar-item[title="Close"]').scrollIntoView().should('be.visible').click();
-        cy.deleteComponentByPath(textInputDrop);
-    };
-
     const testCopyPasteComponent = function (textInputEditPathSelector, textInputEditPathSelectorCopy, textInputDrop) {
         dropTextInputInContainer();
         cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textInputEditPathSelector);
@@ -143,15 +120,11 @@ describe('Page - Authoring', function () {
 
         it('open edit dialog of TextInput', function () {
             testTextInputBehaviour(textInputEditPathSelector, textInputDrop);
-        });
+        })
 
         it.skip('pasted component should have unique name', function () {
             testCopyPasteComponent(textInputEditPathSelector, textInputEditPathSelectorCopy, textInputDrop);
-        });
-
-        it('check rich text support for label', function(){
-            testRichTextDialog(textInputEditPathSelector, textInputDrop);
-        });
+        })
     })
 
   context('Open Sites Editor', function () {
@@ -176,10 +149,6 @@ describe('Page - Authoring', function () {
       testTextInputBehaviour(textInputEditPathSelector, textInputDrop, true);
     });
 
-    it('check rich text support for label in sites', function(){
-        testRichTextDialog(textInputEditPathSelector, textInputDrop, true);
-    });
-
     // conditionally run the test on latest addon
     //if (cy.af.isLatestAddon()) {
         it('Test z-index of Rule editor iframe', function () {