diff --git a/format-master.xml b/format-master.xml
index bbd76be..38aa9e1 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -59,6 +59,9 @@
 	<!-- Lists (itemised, enumerated, definition). -->
 	<include href="modules/lists.xml" />
 
+	<!-- Obsolete items (in order to provide informative error messages). -->
+	<include href="modules/obsolete.xml" />
+	
 
 	<!--
 		Question text. This only exists so that we can ensure that appropriate
@@ -415,18 +418,6 @@
 	</template>
 	
 	
-	<!--
-		Anything inside a <metadata> is ignored completely. (More
-		accurately, we pick bits out of it manually as required; it's
-		only ignored by apply-templates.)
-
-		If we move to using attributes of "document" for all metadata, this will become redundant.
-	-->
-	<template name="metadata" match="metadata">
-		<common>
-			<xsl:message><xsl:text>Use of metadata element obsolete!</xsl:text></xsl:message>
-		</common>
-	</template>
 	
 	
 	<!--
@@ -434,12 +425,6 @@
 	-->
 	<template name="omit" match="omit" />
 
-	<!--
-		...and the legacy id tags inside figures.
-	-->
-	<template match="figure/id" />
-	<template match="figure/label" />
-
 	
 	<!--
 		Comments are not quite ignored completely, as they're carried through to the output document (kind of: "It is an error if instantiating the content of xsl:comment creates nodes other than text nodes.")
@@ -496,8 +481,7 @@
 		you don't specify @type, it assumes the type of document that
 		you're currently generating (HTML or LaTeX).
 		
-		LaTeX documents are simply included using \input{...}. The old
-		<latex-input> element is now deprecated.
+		LaTeX documents are simply included using \input{...}.
 
 		HTML documents are a little trickier, as there's no equivalent
 		of \input{} in HTML, plus the XSLT processor always seems to
@@ -694,15 +678,6 @@
 		<common formats="/html/xhtml/"><xsl:copy-of select="*" /></common>
 	</template>
 		
-	<!-- Generate a LaTeX \input{} macro. -->
-	<template name="latex-input" match="latex-input">
-		<common formats="/latex/xelatex/">
-			<xsl:message>Use of latex-input is deprecated. Please use include-document instead.</xsl:message>
-			\input{<xsl:value-of select="." />}
-		</common>
-	</template>
-
-	
 	<!--
 		Conditional processing depending on the format. It may appear redundant to have two templates, but this is the only way to ensure that the LaTeX template is empty in the HTML style sheet, and vice versa.