diff --git a/strip-frames.xsl b/strip-frames.xsl
index f38c89b19d4a4cdcd717cac84ba7fa3756443add..a665d8e2ec515a036fefab02f9d694647f45510f 100644
--- a/strip-frames.xsl
+++ b/strip-frames.xsl
@@ -51,12 +51,6 @@
   <xsl:comment>Stripped empty &lt;text:p text:style-name="<xsl:value-of select="@text:style-name"/>"&gt;</xsl:comment>
 </xsl:template>
 
-<!--
-<xsl:template match="text:p[count(draw:frame/draw:text-box) > 0]">
--->
-<!--
-<xsl:template match="text:p[draw:frame/draw:text-box]">
--->
 <xsl:template match="text:p[draw:frame]">
   <xsl:comment>Removed outer text:p</xsl:comment>
   <xsl:copy>
@@ -96,23 +90,13 @@
 
 <xsl:template match="text:p/draw:frame[count(draw:text-box) = count(*)]">
   <xsl:comment>draw:frame</xsl:comment>
-<!--
-  <xsl:for-each select="./draw:text-box/*">
--->
-    <xsl:comment>draw:text-box</xsl:comment>
-    <xsl:element name="text:section">
-      <xsl:attribute name="text:name">
-        <xsl:value-of select="concat('PlaceholderSection', position())" />
-      </xsl:attribute>
-      
-      <xsl:apply-templates select="./draw:text-box/*"/>
-<!--
-      <xsl:apply-templates select="."/>
--->
-    </xsl:element>
-<!--
-  </xsl:for-each>
--->
+  <xsl:comment>draw:text-box</xsl:comment>
+  <xsl:element name="text:section">
+    <xsl:attribute name="text:name">
+      <xsl:value-of select="concat('PlaceholderSection', position())" />
+    </xsl:attribute>
+    <xsl:apply-templates select="./draw:text-box/*"/>
+  </xsl:element>
 </xsl:template>
 <!-- companion for the above, catches frames not handled because outside of
      supported elements.  Should never happen, but helps debugging of unexpected