diff --git a/format-master.xml b/format-master.xml
index 6f38689..c766271 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -587,10 +587,10 @@
 		<html>
 			<xsl:choose>
 				<xsl:when test="/document/@class = 'tutorial'">
-					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="/document/@sequence-number|//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="/document/@sequence-number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
 				</xsl:when>
 				<xsl:when test="/document/@class = 'laboratory'">
-					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="/document/@sequence-number|//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="/document/@sequence-number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
 				</xsl:when>
 				<xsl:otherwise>
 					<H1><xsl:apply-templates/></H1>
@@ -607,10 +607,10 @@
 		<html>
 			<xsl:choose>
 				<xsl:when test="/document/@class = 'tutorial'">
-					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="/document/@sequence-number|//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="/document/@sequence-number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
 				</xsl:when>
 				<xsl:when test="/document/@class = 'laboratory'">
-					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="/document/@sequence-number|//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="/document/@sequence-number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
 				</xsl:when>
 				<xsl:otherwise>
 					<H1><xsl:apply-templates/></H1>
@@ -728,7 +728,11 @@
 
 		If we move to using attributes of "document" for all metadata, this will become redundant.
 	-->
-	<template name="metadata" match="metadata"/>
+	<template name="metadata" match="metadata">
+		<common>
+			<xsl:message><xsl:text>Use of metadata element obsolete!</xsl:text></xsl:message>
+		</common>
+	</template>
 	
 	
 	<!--
@@ -1246,31 +1250,14 @@
 				<!-- Sounds nicer...I think ideally the XSL processor would automatically figure out the path to the graphics based on the path to the source XML file.  Can this be done? -->
 				<xsl:when test="name(/child::node()[1])='tutorial' or /document/@class = 'tutorial'">
 					<xsl:text>\tutroot/</xsl:text>
-					<!-- Phasing in new metadata-as-attributes approach: -->
-					<xsl:choose>
-						<!-- New style: use attributes: -->
-						<xsl:when test="/document/@sequence-number">
-							<!-- Note: support for format-number() is poor/nonexistent in Xalan, unless you build it (and Xerces) with the ICU package.  Which you can't do using Cygwin. :^( -->
-							<!-- Xalan also seems to require numbers to be written with a decimal point, otherwise it treats them as text. -->
-							<xsl:value-of select="format-number(/document/@sequence-number, '00')"/><xsl:text>-</xsl:text><xsl:value-of select="/document/@title-code"/>
-						</xsl:when>
-						<!-- Old style: sub-elements of "metadata": -->
-						<xsl:when test="//metadata/number-code">
-							<xsl:value-of select="//metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="//metadata/title-code"/>
-						</xsl:when>
-					</xsl:choose>
+					<!-- Note: support for format-number() is poor/nonexistent in Xalan, unless you build it (and Xerces) with the ICU package.  Which you can't do using Cygwin. :^( -->
+					<!-- Xalan also seems to require numbers to be written with a decimal point, otherwise it treats them as text. -->
+					<xsl:value-of select="format-number(/document/@sequence-number, '00')"/><xsl:text>-</xsl:text><xsl:value-of select="/document/@title-code"/>
 					<xsl:text>/Graphics</xsl:text>			
 				</xsl:when>
 				<xsl:when test="name(/child::node()[1])='laboratory' or /document/@class = 'laboratory'">
 					<xsl:text>\labroot/</xsl:text>
-					<xsl:choose>
-						<xsl:when test="/document/@sequence-number">
-							<xsl:value-of select="format-number(/document/@sequence-number, '00')"/><xsl:text>-</xsl:text><xsl:value-of select="/document/@title-code"/><xsl:text>/Graphics</xsl:text>
-						</xsl:when>
-						<xsl:when test="//metadata/number-code">
-							<xsl:value-of select="//metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="//metadata/title-code"/><xsl:text>/Graphics</xsl:text>
-						</xsl:when>
-					</xsl:choose>
+					<xsl:value-of select="format-number(/document/@sequence-number, '00')"/><xsl:text>-</xsl:text><xsl:value-of select="/document/@title-code"/><xsl:text>/Graphics</xsl:text>
 				</xsl:when>
 				<!-- Allow the author to specify a non-standard image location on the fly. -->
 				<xsl:when test="count(location) != 0">
