diff --git a/build.xml b/build.xml
index 005128ae..e5f21db1 100644
--- a/build.xml
+++ b/build.xml
@@ -156,7 +156,7 @@
 
     <!--
         There are many separate processing "streams":  production, test, export,
-        fallback, "wayf", "cdsall" and "cms".
+        fallback, "wayf", and "cdsall".
 
         Each stream has its own unsigned file, as follows:
     -->
@@ -168,10 +168,9 @@
     <property name="mdaggr.back.unsigned"   value="ukfederation-back-unsigned.xml"/>
     <property name="mdaggr.wayf.unsigned"   value="ukfederation-wayf-unsigned.xml"/>
     <property name="mdaggr.cdsall.unsigned" value="ukfederation-cdsall-unsigned.xml"/>
-    <property name="mdaggr.cms.unsigned"    value="cms-metadata.xml"/>
 
     <!--
-        Each stream except the CMS stream has its own signed file.
+        Each stream also has its own signed file, as follows:
     -->
     <property name="mdaggr.prod.signed"     value="ukfederation-metadata.xml"/>
     <property name="mdaggr.test.signed"     value="ukfederation-test.xml"/>
@@ -322,29 +321,6 @@
         <echo>Verification completed.</echo>
     </target>
 
-    <!--
-        *************************
-        ***                   ***
-        ***   M E M B E R S   ***
-        ***                   ***
-        *************************
-    -->
-
-    <!--
-        generate.members.cms
-
-        Produce a variant of the members.xml file suitable for
-        consumption by the legacy CMS.
-    -->
-    <target name="generate.members.cms">
-        <echo>Generating CMS version of members.xml</echo>
-        <XALAN
-            i="${members.dir}/members.xml"
-            o="${output.dir}/members-cms.xml"
-            x="${mdx.dir}/uk/members-cms.xsl"/>
-        <echo>Generated CMS version of members.xml</echo>
-    </target>
-
     <!--
         *************************************************
         ***                                           ***
@@ -415,7 +391,6 @@
         <MDNORM i="${output.dir}/${mdaggr.prod.unsigned}"/>
         <MDNORM i="${output.dir}/${mdaggr.wayf.unsigned}"/>
         <MDNORM.noblank i="${output.dir}/${mdaggr.cdsall.unsigned}"/>
-        <MDNORM.noblank i="${output.dir}/${mdaggr.cms.unsigned}"/>
         <MDNORM i="${output.dir}/${mdaggr.test.unsigned}"/>
         <MDNORM i="${output.dir}/${mdaggr.export.unsigned}"/>
         <MDNORM i="${output.dir}/${mdaggr.export.preview.unsigned}"/>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 334d75c4..b259957e 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -798,100 +798,8 @@
             </list>
         </property>
     </bean>
-    
-    <!--
-        *************************************
-        ***                               ***
-        ***   C M S   A G G R E G A T E   ***
-        ***                               ***
-        *************************************
-    -->
-    
-    <!--
-        Produces an aggregate which is consumed by the helpdesk's
-        call management system. This will be well-formed XML
-        but will NOT be schema valid, as many required elements
-        are removed to give a smaller output file.
-    -->
-    
-    <!--
-        CMSStripUnwanted
-        
-        The CMS needs only a very restricted subset of
-        normal metadata in order to do its job.  This stage
-        removes everything it does not need.
-    -->
-    <bean id="CMSStripUnwanted" parent="CompositeStage">
-        <property name="composedStages">
-            <list>
-                <ref bean="stripComments"/>
-                
-                <ref bean="stripAlgNamespace"/>
-                <ref bean="stripIdpdiscNamespace"/>
-                <ref bean="stripInitNamespace"/>
-                <ref bean="stripMdattrNamespace"/>
-                <ref bean="stripWayfNamespace"/>
-                
-                <ref bean="stripArtifactResolutionService"/>
-                <ref bean="stripAssertionConsumerService"/>
-                <ref bean="stripAttributeAuthorityDescriptor"/>
-                <ref bean="stripKeyDescriptor"/>
-                <ref bean="stripManageNameIDService"/>
-                <ref bean="stripNameIDFormat"/>
-                <ref bean="stripSingleLogoutService"/>
-                <ref bean="stripSingleSignOnService"/>
-                
-                <ref bean="stripMDUIDiscoHints"/>
-                
-                <ref bean="stripEntityScopes"/>
-                
-                <!-- remove any now-empty Extensions elements -->
-                <ref bean="stripEmptyExtensions"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="CMSFinalise" parent="finalise_parent">
-        <property name="transformParameters">
-            <map>
-                <entry key="extraText"
-                    value="Call Management System metadata; not for end entity use"/>
-                <entry key="publisher" value-ref="uk_federation_uri"/>
-            </map>
-        </property>
-    </bean>
-    
-    <bean id="serializeCMSAggregate" parent="SerializationStage">
-        <property name="outputFile">
-            <bean class="java.io.File">
-                <constructor-arg value="${output.dir}/cms-metadata.xml"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <bean id="CMSPipeline" parent="SimplePipeline">
-        <property name="stages">
-            <list>
-                <!-- make an aggregate first so that we're only traversing one item -->
-                <ref bean="uk_assemble"/>
-                
-                <!-- remove many things that the CMS doesn't look at -->
-                <ref bean="CMSStripUnwanted"/>
-                
-                <ref bean="CMSFinalise"/>
 
-                <!--
-                    Normalise namespaces in the most general way. This will leave in a number
-                    of unwanted namespace prefix declarations (e.g., xmlns:wayf) but that's
-                    not really important for an aggregate we don't publish.
-                -->
-                <ref bean="normaliseNamespaces"/>
-                
-                <ref bean="serializeCMSAggregate"/>
-            </list>
-        </property>
-    </bean>
-    
+
     <!--
         *************************************
         ***                               ***
@@ -922,8 +830,7 @@
                 -->
                 
                 <!--
-                    Fork new output pipelines for the registrar statistics and for
-                    the CMS aggregate.
+                    Fork a new output pipeline for the registrar statistics.
                 -->
                 <bean id="rawRegistrarDemux" parent="PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
@@ -932,10 +839,6 @@
                                 <constructor-arg ref="uk_statisticsPipeline"/>
                                 <constructor-arg ref="everythingSelector"/>
                             </bean>
-                            <bean class="net.shibboleth.utilities.java.support.collection.Pair">
-                                <constructor-arg ref="CMSPipeline"/>
-                                <constructor-arg ref="everythingSelector"/>
-                            </bean>
                         </list>
                     </property>
                     <property name="waitingForPipelines" value="true"/>
diff --git a/mdx/uk/members-cms.xsl b/mdx/uk/members-cms.xsl
deleted file mode 100644
index bf88cc6c..00000000
--- a/mdx/uk/members-cms.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	members-cms.xsl
-	
-	Tweak the members.xml document so that it can be consumed by the legacy CMS.
--->
-<xsl:stylesheet version="1.0"
-	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:members="http://ukfederation.org.uk/2007/01/members"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	exclude-result-prefixes="members">
-
-	<!--
-        Force UTF-8 encoding for the output.
-    -->
-	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8"/>
-	
-	<!--
-		Remove ID attributes from Member and DomainOwner elements.
-	-->
-	<xsl:template match="members:Member/@ID">
-		<!-- nothing -->
-	</xsl:template>
-	<xsl:template match="members:DomainOwner/@ID">
-		<!-- nothing -->
-	</xsl:template>
-	
-	<!--By default, copy text blocks, comments and attributes unchanged.-->
-	<xsl:template match="text()|comment()|@*">
-		<xsl:copy/>
-	</xsl:template>
-	
-	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
-	<xsl:template match="*">
-		<xsl:copy>
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:copy>
-	</xsl:template>
-	
-</xsl:stylesheet>