diff --git a/build.xml b/build.xml
index 69abe451..30ab2c33 100644
--- a/build.xml
+++ b/build.xml
@@ -335,9 +335,6 @@
     <property name="mdaggr.stats" value="ukfederation-stats.html"/>
     <property name="post-receive-githook" value="post-receive"/>
     <property name="md.githook.path" value="/var/git/ukf-products/.git/hooks" />
-    <property name="mdaggr.discofeed.filtered" value="discofeed.json"/>
-    <property name="mdaggr.discofeed.all" value="discofeed-all.json"/>
-    <property name="md.discofeed.path" value="/tmp" />
 
     <!--
         *************************************************
@@ -672,7 +669,6 @@
         git.data.allbranches.pushtoorigin,
         scp.githook,
         publish.mdqcache,
-        publish.json,
         publish.md,
         publish.otherfiles,
         samlmd.aggregates.verify.remote,
@@ -1641,11 +1637,6 @@
         -->
         <CHANNEL.do channel="uk" verb="generate"/>
 
-        <!--
-            Generate discovery feeds.
-        -->
-        <CHANNEL.do channel="uk" verb="discofeeds"/>
-
         <!--
             Post-process mda-generated output files.
         -->
@@ -2447,42 +2438,6 @@
         </scp>
     </target>
 
-    <target name="publish.json">
-        <!--
-            Push 2 JSON files to the MD dist servers
-        -->
-        <echo>Pushing UK Federation JSON files to MD dist.</echo>
-        <echo>-> MD-NE-01</echo>
-        <scp failonerror="true" remoteTodir="${md.user}@${md.dist.host-ne-01.name}:${md.discofeed.path}" keyfile="~/.ssh/id_rsa" knownhosts="~/.ssh/known_hosts">
-            <fileset dir="${output.dir}">
-                <include name="${mdaggr.discofeed.filtered}"/>
-                <include name="${mdaggr.discofeed.all}"/>
-            </fileset>
-        </scp>
-        <echo>-> MD-NE-02</echo>
-        <scp failonerror="true" remoteTodir="${md.user}@${md.dist.host-ne-02.name}:${md.discofeed.path}" keyfile="~/.ssh/id_rsa" knownhosts="~/.ssh/known_hosts">
-            <fileset dir="${output.dir}">
-                <include name="${mdaggr.discofeed.filtered}"/>
-                <include name="${mdaggr.discofeed.all}"/>
-            </fileset>
-        </scp>
-        <echo>-> MD-WE-01</echo>
-        <scp failonerror="true" remoteTodir="${md.user}@${md.dist.host-we-01.name}:${md.discofeed.path}" keyfile="~/.ssh/id_rsa" knownhosts="~/.ssh/known_hosts">
-            <fileset dir="${output.dir}">
-                <include name="${mdaggr.discofeed.filtered}"/>
-                <include name="${mdaggr.discofeed.all}"/>
-            </fileset>
-        </scp>
-        <echo>-> MD-WE-02</echo>
-        <scp failonerror="true" remoteTodir="${md.user}@${md.dist.host-we-02.name}:${md.discofeed.path}" keyfile="~/.ssh/id_rsa" knownhosts="~/.ssh/known_hosts">
-            <fileset dir="${output.dir}">
-                <include name="${mdaggr.discofeed.filtered}"/>
-                <include name="${mdaggr.discofeed.all}"/>
-            </fileset>
-        </scp>
-    </target>
-
-
     <target name="publish.otherfiles">
         <!--
             Push other files for the UK Federation to the web server - but only when in prod env!
diff --git a/mdx/uk/discofeeds.xml b/mdx/uk/discofeeds.xml
deleted file mode 100644
index 6ca0da30..00000000
--- a/mdx/uk/discofeeds.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Verb to generate EDS-format JSON discovery feeds corresponding to
-    the (previously generated) unsigned production aggregate.
-
-    Two such feeds are generated:
-
-    * discofeed-all.json includes all IdPs in the production aggregate.
-
-    * discofeed.json includes only those IdPs not marked as hidden.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    default-lazy-init="true"
-    xmlns:c="http://www.springframework.org/schema/c"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
-    <!--
-        Import commonly used beans.
-    -->
-    <import resource="classpath:common-beans.xml"/>
-
-    <!--
-        Import channel-specific beans.
-    -->
-    <import resource="classpath:uk/beans.xml"/>
-
-
-    <!--
-        ***************************************************
-        ***                                             ***
-        ***   P R O D U C T I O N   A G G R E G A T E   ***
-        ***                                             ***
-        ***************************************************
-    -->
-
-    <bean id="serializeUnsignedProductionAggregate" parent="mda.SerializationStage">
-        <property name="serializer" ref="serializer"/>
-        <property name="outputFile">
-            <bean parent="File">
-                <constructor-arg value="${output.dir}/ukfederation-metadata-unsigned.xml"/>
-            </bean>
-        </property>
-    </bean>
-
-
-    <!--
-        *************************************
-        ***                               ***
-        ***   M A I N   P I P E L I N E   ***
-        ***                               ***
-        *************************************
-    -->
-
-    <bean id="discoFeedSerializer" parent="ukf.DiscoFeedCollectionSerializer"
-        p:prettyPrinting="true" p:includingLegacyDisplayNames="true"/>
-
-    <bean id="discofeeds" parent="mda.SimplePipeline">
-        <property name="stages">
-            <list>
-                <!--
-                    Acquire the production aggregate and split it into
-                    individual entities.
-                -->
-                <bean id="productionAggregate" parent="mda.DOMResourceSourceStage"
-                    p:parserPool-ref="parserPool">
-                    <property name="DOMResource">
-                        <bean parent="FileSystemResource">
-                            <constructor-arg value="${output.dir}/ukfederation-metadata-unsigned.xml"/>
-                        </bean>
-                    </property>
-                </bean>
-                <ref bean="disassemble"/>
-
-                <!--
-                    Serialize all IdPs in the collection into a feed.
-                -->
-                <bean id="discoFeedAll" parent="mda.SerializationStage"
-                    p:serializer-ref="discoFeedSerializer">
-                    <property name="outputFile">
-                        <bean parent="File">
-                            <constructor-arg value="${output.dir}/discofeed-all.json"/>
-                        </bean>
-                    </property>
-                </bean>
-
-                <!--
-                    Remove all "hidden from discovery" IdPs.
-                -->
-                <bean id="removeHidden" parent="mda.XPathFilteringStage"
-                    p:namespaceContext-ref="commonNamespaces"
-                    p:XPathExpression="//mdattr:EntityAttributes/saml:Attribute
-                        [@Name = 'http://macedir.org/entity-category']
-                        [@NameFormat = 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri']
-                        [saml:AttributeValue[.='http://refeds.org/category/hide-from-discovery']]"/>
-
-                <!--
-                    Serialize all IdPs that remain into a second feed.
-                -->
-                <bean id="discoFeed" parent="mda.SerializationStage"
-                    p:serializer-ref="discoFeedSerializer">
-                    <property name="outputFile">
-                        <bean parent="File">
-                            <constructor-arg value="${output.dir}/discofeed.json"/>
-                        </bean>
-                    </property>
-                </bean>
-
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/utilities/githooks/post-receive b/utilities/githooks/post-receive
index 52303df1..946104f4 100755
--- a/utilities/githooks/post-receive
+++ b/utilities/githooks/post-receive
@@ -11,11 +11,6 @@ apachemdqdir=/var/www/html/mdq.uou/entities
 # Set the location of the temporary mdq cache dir
 mdqcachedir=/tmp/mdqcache
 
-# Set the location of JSON discofeed files
-jsontempdir=/tmp
-discofeed=discofeed.json
-discofeedall=discofeed-all.json
-
 # This Git repo has had the latest stuff pushed to it, but it hasn't checked it out yet. So let's do it.
 git --work-tree=$gitdir --git-dir=$gitdir/.git checkout -f
 
@@ -27,12 +22,6 @@ do
 done
 echo "Done."
 
-# The JSON files should have been SCPed to /tmp and be sitting there happily.
-echo -n "Gzipping 2 JSON discofeed files..."
-gzip -9 < "${jsontempdir}/$discofeed" > "${jsontempdir}/${discofeed}.gz"
-gzip -9 < "${jsontempdir}/$discofeedall" > "${jsontempdir}/${discofeedall}.gz"
-echo "Done."
-
 # The MDQ cache should have been SCPed to /tmp and be sitting there happily.
 # First, we should untar it.
 echo -n "Untarring mdq cache... "
@@ -88,14 +77,12 @@ mtime=$(git --work-tree=$gitdir --git-dir=$gitdir/.git show $newrev --quiet --pr
 echo -n "Setting the timestamp on each file to that of the commit... "
 find $gitdir -regextype posix-extended -regex '.*\.(xml|gz)' -exec touch -d @$mtime {} \;
 find $mdqcachedir -exec touch -d @$mtime {} \;
-touch -d @$mtime ${jsontempdir}/$discofeed ${jsontempdir}/${discofeed}.gz ${jsontempdir}/$discofeedall ${jsontempdir}/${discofeedall}.gz
 echo "Done."
 
 # Put files into the correct directory
 echo -n "Rsyncing files to the appropriate apache directory... "
 rsync -at $gitdir/aggregates/*.{xml,gz} $apacheaggrdir
 rsync -at --delete $mdqcachedir/ $apachemdqdir
-rsync -at ${jsontempdir}/$discofeed ${jsontempdir}/${discofeed}.gz ${jsontempdir}/$discofeedall ${jsontempdir}/${discofeedall}.gz $apacheaggrdir
 echo "Done."
 
 # Remove the temporary files