diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 22243e3..ef55837 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -90,8 +90,8 @@
           <p class="comment-parent visually-hidden">{{ parent }}</p>
         {% endif %}
       </div>
-    </div> <!-- /.attribution -->
-  </header> <!-- /.comment-header -->
+    </div>
+  </header>
   <div class="comment-text">
     <div class="comment-arrow"></div>
     {#
@@ -107,7 +107,7 @@
     {% endif %}
     <div{{ content_attributes.addClass('content') }}>
       {{ content|without('links') }}
-    </div> <!-- /.content -->
+    </div>
     <footer class="comment-footer">
       {% if signature %}
         <div class="user-signature clearfix">{{ signature }}</div>
@@ -115,6 +115,6 @@
       {% if content.links %}
         <nav>{{ content.links }}</nav>
       {% endif %}
-    </footer> <!-- /.comment-footer -->
-  </div> <!-- /.comment-text -->
+    </footer>
+  </div>
 </article>
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 5c2e980..3e41387 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -26,10 +26,10 @@
                 {{ site_slogan }}
               </div>
             {% endif %}
-          </div> <!-- /#name-and-slogan -->
+          </div>
         {% endif %}
-      </div> <!-- /.section -->
-    </header> <!-- /#header -->
+      </div>
+    </header>
     <div id="main-wrapper">
       <div id="main" class="clearfix">
         <main id="content" class="column" role="main">
@@ -44,11 +44,11 @@
                 <div class="section clearfix">
                   {{ messages }}
                 </div>
-              </div> <!-- /#messages -->
+              </div>
             {% endif %}
-          </section> <!-- /.section -->
-        </main> <!-- /#content -->
-      </div> <!-- /.section -->
-    </div> <!-- /#main-wrapper -->
-  </div> <!-- /#page -->
-</div> <!-- /#page-wrapper -->
+          </section>
+        </main>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index ef758f2..26fe7fd 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -106,23 +106,23 @@
                 {{ site_slogan }}
               </div>
             {% endif %}
-          </div><!-- /#name-and-slogan -->
+          </div>
         {% endif %}
         {{ page.header }}
         {{ page.primary_menu }}
-      </div> <!-- /.section -->
-    </header> <!-- /.section -->
+      </div>
+    </header>
     {% if messages %}
       <div id="messages">
         <div class="section clearfix">{{ messages }}</div>
-      </div> <!-- /#messages -->
+      </div>
     {% endif %}
     {% if page.featured %}
       <div id="featured">
         <aside class="section clearfix" role="complementary">
           {{ page.featured }}
-        </aside> <!-- /.section -->
-      </div> <!-- /#featured -->
+        </aside>
+      </div>
     {% endif %}
     <div id="main-wrapper" class="clearfix">
       <div id="main" class="clearfix">
@@ -148,32 +148,32 @@
               <ul class="action-links">{{ action_links }}</ul>
             {% endif %}
             {{ page.content }}
-          </section>  <!-- /.section -->
-        </main> <!-- /#content -->
+          </section>
+        </main>
         {% if page.sidebar_first %}
           <div id="sidebar-first" class="column sidebar">
             <aside class="section" role="complementary">
               {{ page.sidebar_first }}
-            </aside><!-- /.section -->
-          </div><!-- /#sidebar-first -->
+            </aside>
+          </div>
         {% endif %}
         {% if page.sidebar_second %}
           <div id="sidebar-second" class="column sidebar">
             <aside class="section" role="complementary">
               {{ page.sidebar_second }}
-            </aside> <!-- /.section -->
-          </div><!-- /#sidebar-second -->
+            </aside>
+          </div>
         {% endif %}
-      </div> <!-- /#main -->
-    </div> <!-- /#main-wrapper -->
+      </div>
+    </div>
     {% if page.triptych_first or page.triptych_middle or page.triptych_last %}
       <div id="triptych-wrapper">
         <aside id="triptych" class="clearfix" role="complementary">
           {{ page.triptych_first }}
           {{ page.triptych_middle }}
           {{ page.triptych_last }}
-        </aside> <!-- /#triptych -->
-      </div> <!-- /#triptych-wrapper -->
+        </aside>
+      </div>
     {% endif %}
     <div id="footer-wrapper">
       <footer class="section">
@@ -183,14 +183,14 @@
             {{ page.footer_secondcolumn }}
             {{ page.footer_thirdcolumn }}
             {{ page.footer_fourthcolumn }}
-          </div> <!-- /#footer-columns -->
+          </div>
         {% endif %}
         {% if page.footer %}
           <div id="footer" role="contentinfo" class="clearfix">
             {{ page.footer }}
-          </div> <!-- /#footer -->
+          </div>
         {% endif %}
-      </footer> <!-- /.section -->
-    </div> <!-- /#footer-wrapper -->
-  </div> <!-- /#page -->
-</div> <!-- /#page-wrapper -->
+      </footer>
+    </div>
+  </div>
+</div>