diff --git a/core/modules/system/templates/field-multiple-value-form.html.twig b/core/modules/system/templates/field-multiple-value-form.html.twig
index 348621c..0ab08e9 100644
--- a/core/modules/system/templates/field-multiple-value-form.html.twig
+++ b/core/modules/system/templates/field-multiple-value-form.html.twig
@@ -20,13 +20,13 @@
  */
 #}
 {% if multiple %}
-  <div class="js-form-item form-item">
+  <div class="js-form-item">
     {{ table }}
     {% if description %}
-      <div class="description">{{ description }}</div>
+      <div>{{ description }}</div>
     {% endif %}
     {% if button %}
-      <div class="clearfix">{{ button }}</div>
+      <div>{{ button }}</div>
     {% endif %}
   </div>
 {% else %}
diff --git a/core/modules/system/templates/fieldset.html.twig b/core/modules/system/templates/fieldset.html.twig
index b67ec85..3ca2baa 100644
--- a/core/modules/system/templates/fieldset.html.twig
+++ b/core/modules/system/templates/fieldset.html.twig
@@ -25,38 +25,34 @@
 {%
   set classes = [
     'js-form-item',
-    'form-item',
     'js-form-wrapper',
-    'form-wrapper',
   ]
 %}
 <fieldset{{ attributes.addClass(classes) }}>
   {%
     set legend_span_classes = [
-      'fieldset-legend',
       required ? 'js-form-required',
-      required ? 'form-required',
     ]
   %}
   {#  Always wrap fieldset legends in a SPAN for CSS positioning. #}
   <legend{{ legend.attributes }}>
     <span{{ legend_span.attributes.addClass(legend_span_classes) }}>{{ legend.title }}</span>
   </legend>
-  <div class="fieldset-wrapper">
+  <div>
     {% if errors %}
       <div>
         {{ errors }}
       </div>
     {% endif %}
     {% if prefix %}
-      <span class="field-prefix">{{ prefix }}</span>
+      <span>{{ prefix }}</span>
     {% endif %}
     {{ children }}
     {% if suffix %}
-      <span class="field-suffix">{{ suffix }}</span>
+      <span>{{ suffix }}</span>
     {% endif %}
     {% if description.content %}
-      <div{{ description.attributes.addClass('description') }}>{{ description.content }}</div>
+      <div{{ description.attributes }}>{{ description.content }}</div>
     {% endif %}
   </div>
 </fieldset>
diff --git a/core/modules/system/templates/form-element-label.html.twig b/core/modules/system/templates/form-element-label.html.twig
index 7696609..a86ade4 100644
--- a/core/modules/system/templates/form-element-label.html.twig
+++ b/core/modules/system/templates/form-element-label.html.twig
@@ -16,10 +16,8 @@
 #}
 {%
   set classes = [
-    title_display == 'after' ? 'option',
     title_display == 'invisible' ? 'visually-hidden',
     required ? 'js-form-required',
-    required ? 'form-required',
   ]
 %}
 {% if title is not empty or required -%}
diff --git a/core/modules/system/templates/form-element.html.twig b/core/modules/system/templates/form-element.html.twig
index 2599e34..6747ef4 100644
--- a/core/modules/system/templates/form-element.html.twig
+++ b/core/modules/system/templates/form-element.html.twig
@@ -49,17 +49,13 @@
 {%
   set classes = [
     'js-form-item',
-    'form-item',
     'js-form-type-' ~ type|clean_class,
-    'form-item-' ~ name|clean_class,
-    title_display not in ['after', 'before'] ? 'form-no-label',
     disabled == 'disabled' ? 'form-disabled',
     errors ? 'form-item--error',
   ]
 %}
 {%
   set description_classes = [
-    'description',
     description_display == 'invisible' ? 'visually-hidden',
   ]
 %}
@@ -68,7 +64,7 @@
     {{ label }}
   {% endif %}
   {% if prefix is not empty %}
-    <span class="field-prefix">{{ prefix }}</span>
+    <span>{{ prefix }}</span>
   {% endif %}
   {% if description_display == 'before' and description.content %}
     <div{{ description.attributes }}>
@@ -77,7 +73,7 @@
   {% endif %}
   {{ children }}
   {% if suffix is not empty %}
-    <span class="field-suffix">{{ suffix }}</span>
+    <span>{{ suffix }}</span>
   {% endif %}
   {% if label_display == 'after' %}
     {{ label }}