diff --git a/format-master.xml b/format-master.xml
index 42f3364..083225d 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -32,15 +32,6 @@
 	<!-- Relational algebra operators. -->
 	<include href="modules/relational-algebra.xml" />
 
-	<template name="LaTeX" match="LaTeX|latex">
-		<common formats="/latex/xelatex/">{\LaTeX}</common>
-		<common formats="/html/xhtml/">L<sup>A</sup>T<sub>E</sub>X</common>
-	</template>
-
-	<template name="LaTeX-strip" match="LaTeX|latex" mode="strip">
-		<common formats="/html/xhtml/">LaTeX</common>
-	</template>
-
 	<!-- In-text "menus", e.g., for displaying things like Windows Start Menu items. -->
 	<include href="modules/menus.xml" />
 
@@ -62,74 +53,8 @@
 	<!-- 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
-		<p> tags are correctly inserted. If this template didn't exist, showing
-		the answers would generate invalid HTML. The answers are enclosed in a
-		<div class="answer">...</div>. Without this template, the answer markup
-		ends up embedded inside <p>...</p>, which is invalid.
-	-->
-	<template name="question" match="question">
-		<common formats="/latex/xelatex/"><xsl:apply-templates /></common>
-		<common formats="/html/xhtml/">
-			<xsl:choose>
-				<!--
-					Check whether there are actual paragraphs inside the
-					question. If so, let them worry about inserting the
-					<p> tags.
-				-->
-				<xsl:when test="count(paragraph|para|p|question|answer|code-block) != 0">
-					<xsl:apply-templates />
-				</xsl:when>
-				<!--
-					Otherwise, insert <p> tags surrounding the question content.
-				-->
-				<xsl:otherwise>
-					<p><xsl:apply-templates /></p>
-				</xsl:otherwise>
-			</xsl:choose>
-		</common>
-	</template>
-
-	
-	<!--
-		Sample answers, which may optionally be excluded from the
-		output. This can be done globally for all answers by setting the
-		style sheet parameter $showanswers to "no", or it can be done
-		locally on a question-by-question basis by setting the @hide
-		attribute of the element to "yes".
-		
-		@hide: If "yes", don't include this answer in the output stream.
-		The default is to include the answer.
-	-->
-	<template name="answer" match="answer">
-		<common formats="/latex/xelatex/">
-			<!--
-				It's nice to weed out the sample answer markup at the XSLT processing stage to make LaTeX run faster.
-				Note that \showanswers still needs to be called so that LaTeX can format chapter headings like "Answers for ..."
-			-->
-			<xsl:if test="$showanswers='yes'">
-			\begin{answer}
-				<xsl:apply-templates />
-			\end{answer}
-
-			</xsl:if>
-		</common>
-		<common formats="/html/xhtml/">
-			<xsl:if test="$showanswers='yes'">
-				<div class="answer">
-					<xsl:apply-templates />
-				</div>
-			</xsl:if>
-		</common>
-	</template>
-	
-	<!--
-		Match hidden answers and do nothing.
-	-->
-	<template name="hidden-answer" match="answer[@hide='yes']" />
-
+	<!-- Text of questions and sample answers. -->
+	<include href="modules/q-and-a.xml" />
 	
 	<!-- Footnotes. -->
 	<include href="modules/footnotes.xml" />