diff --git a/templates/block--no-wrapper.tpl.php b/templates/block--no-wrapper.tpl.php
index 24f9501..059279e 100644
--- a/templates/block--no-wrapper.tpl.php
+++ b/templates/block--no-wrapper.tpl.php
@@ -55,4 +55,3 @@
 <?php print render($title_suffix); ?>
 
 <?php print $content; ?>
-<!-- block__no_wrapper -->
diff --git a/templates/block.tpl.php b/templates/block.tpl.php
index 8322cdf..39de54a 100644
--- a/templates/block.tpl.php
+++ b/templates/block.tpl.php
@@ -57,4 +57,4 @@
 
   <?php print $content; ?>
 
-</div><!-- /.block -->
+</div>
diff --git a/templates/comment.tpl.php b/templates/comment.tpl.php
index 4104a44..a780b1e 100644
--- a/templates/comment.tpl.php
+++ b/templates/comment.tpl.php
@@ -103,4 +103,4 @@
   <?php endif; ?>
 
   <?php print render($content['links']) ?>
-</article><!-- /.comment -->
+</article>
diff --git a/templates/maintenance-page.tpl.php b/templates/maintenance-page.tpl.php
index 0ced6af..c73d34c 100644
--- a/templates/maintenance-page.tpl.php
+++ b/templates/maintenance-page.tpl.php
@@ -60,7 +60,7 @@
         <?php if ($site_slogan): ?>
           <h2 id="site-slogan"><?php print $site_slogan; ?></h2>
         <?php endif; ?>
-      </hgroup><!-- /#name-and-slogan -->
+      </hgroup>
     <?php endif; ?>
 
     <?php print $header; ?>
@@ -77,24 +77,24 @@
       <?php endif; ?>
       <?php print $messages; ?>
       <?php print $content; ?>
-    </div><!-- /#content -->
+    </div>
 
     <div id="navigation">
       <?php print $navigation; ?>
-    </div><!-- /#navigation -->
+    </div>
 
     <?php if ($sidebar_first || $sidebar_second): ?>
       <aside class="sidebars">
         <?php print $sidebar_first; ?>
         <?php print $sidebar_second; ?>
-      </aside><!-- /.sidebars -->
+      </aside>
     <?php endif; ?>
 
-  </div><!-- /#main -->
+  </div>
 
   <?php print $footer; ?>
 
-</div><!-- /#page -->
+</div>
 
 <?php print $bottom; ?>
 
diff --git a/templates/node.tpl.php b/templates/node.tpl.php
index 7e12b6a..819c055 100644
--- a/templates/node.tpl.php
+++ b/templates/node.tpl.php
@@ -117,4 +117,4 @@
 
   <?php print render($content['comments']); ?>
 
-</article><!-- /.node -->
+</article>
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index f3132a5..84f5afa 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -89,7 +89,7 @@
         <?php if ($site_slogan): ?>
           <h2 id="site-slogan"><?php print $site_slogan; ?></h2>
         <?php endif; ?>
-      </hgroup><!-- /#name-and-slogan -->
+      </hgroup>
     <?php endif; ?>
 
     <?php if ($secondary_menu): ?>
@@ -131,7 +131,7 @@
       <?php endif; ?>
       <?php print render($page['content']); ?>
       <?php print $feed_icons; ?>
-    </div><!-- /#content -->
+    </div>
 
     <div id="navigation">
 
@@ -158,7 +158,7 @@
 
       <?php print render($page['navigation']); ?>
 
-    </div><!-- /#navigation -->
+    </div>
 
     <?php
       // Render the sidebars to see if there's anything in them.
@@ -170,13 +170,13 @@
       <aside class="sidebars">
         <?php print $sidebar_first; ?>
         <?php print $sidebar_second; ?>
-      </aside><!-- /.sidebars -->
+      </aside>
     <?php endif; ?>
 
-  </div><!-- /#main -->
+  </div>
 
   <?php print render($page['footer']); ?>
 
-</div><!-- /#page -->
+</div>
 
 <?php print render($page['bottom']); ?>
diff --git a/templates/region--footer.tpl.php b/templates/region--footer.tpl.php
index 0c1c016..33c6085 100644
--- a/templates/region--footer.tpl.php
+++ b/templates/region--footer.tpl.php
@@ -29,5 +29,5 @@
 <?php if ($content): ?>
   <footer id="footer" class="<?php print $classes; ?>">
     <?php print $content; ?>
-  </footer><!-- region__footer -->
+  </footer>
 <?php endif; ?>
diff --git a/templates/region--no-wrapper.tpl.php b/templates/region--no-wrapper.tpl.php
index 65fa7b6..4bbb949 100644
--- a/templates/region--no-wrapper.tpl.php
+++ b/templates/region--no-wrapper.tpl.php
@@ -28,4 +28,3 @@
 ?>
 
 <?php print $content; ?>
-<!-- region__no_wrapper -->
diff --git a/templates/region--sidebar.tpl.php b/templates/region--sidebar.tpl.php
index 960bd38..6606815 100644
--- a/templates/region--sidebar.tpl.php
+++ b/templates/region--sidebar.tpl.php
@@ -29,5 +29,5 @@
 <?php if ($content): ?>
   <section class="<?php print $classes; ?>">
     <?php print $content; ?>
-  </section><!-- region__sidebar -->
+  </section>
 <?php endif; ?>
diff --git a/templates/region.tpl.php b/templates/region.tpl.php
index ee57618..018ea2a 100644
--- a/templates/region.tpl.php
+++ b/templates/region.tpl.php
@@ -29,5 +29,5 @@
 <?php if ($content): ?>
   <div class="<?php print $classes; ?>">
     <?php print $content; ?>
-  </div><!-- /.region -->
+  </div>
 <?php endif; ?>