diff --git a/xml2xslt.xsl b/xml2xslt.xsl
index 5df7319..b38c1eb 100755
--- a/xml2xslt.xsl
+++ b/xml2xslt.xsl
@@ -330,45 +330,19 @@
 	<xsl-out:apply-templates />
 
 	\vfill
-	{\scriptsize \hfill \verb+<xsl-out:apply-templates select="/document/@cvs-id" />+}
+	{\scriptsize \hfill \verb+<xsl-out:apply-templates select="@cvs-id" />+}
 \end{document}
 						</xsl-out:when>
 						<!-- Not standalone: -->
-						<!-- Hmm, maybe this should go in format-master.xml... -->
-						<xsl-out:when test="/document/@class = 'tutorial'">
-							\tutorial{<xsl-out:apply-templates select="/document/title" mode="chapter" />}
-							<!-- <xsl-out:apply-templates select="/tutorial/introduction" />
-							<xsl-out:for-each select="/tutorial/section"> -->
-							<xsl-out:apply-templates select="*[not(self::title)]" />
-							<!-- </xsl-out:for-each> -->
-
-						\vfill {\scriptsize \hfill \verb+<xsl-out:value-of select="/document/@cvs-id" />+}
-						</xsl-out:when>
-						<xsl-out:when test="/document/@class = 'laboratory'">
-							\lab{<xsl-out:apply-templates select="/document/title" mode="chapter" />}
-							<!-- <xsl-out:apply-templates select="/laboratory/introduction" />
-							<xsl-out:for-each select="/tutorial/section"> -->
-							<xsl-out:apply-templates select="*[not(self::title)]" />
-							<!-- </xsl-out:for-each> -->
-
-							\vfill {\scriptsize \hfill \verb+<xsl-out:value-of select="/document/@cvs-id" />+}
-						</xsl-out:when>
 						<xsl-out:otherwise>
-							<!-- maybe we should assume that we're in a book documentclass and issue a \chapter here? -->
-							\general{<xsl-out:apply-templates select="/document/title" mode="chapter" />}
+							<xsl-out:apply-templates select="title" mode="chapter" />
 							<xsl-out:apply-templates select="*[not(self::title)]" />
+
+							\vfill {\scriptsize \hfill \verb+<xsl-out:value-of select="@cvs-id" />+}
 						</xsl-out:otherwise>
 					</xsl-out:choose>
 				</xsl-out:template>
 				
-			<!--
-				<xsl-out:element name="xsl:output">
-					<xsl-out:attribute name="method">text</xsl-out:attribute>
-					<xsl-out:attribute name="encoding">UTF-8</xsl-out:attribute>
-					<xsl-out:attribute name="media-type">text/plain</xsl-out:attribute>
-				</xsl-out:element>
-				-->
-				
 			</xsl:when>
 			
 			<!--