diff --git a/mdx/incommon/mdq-all-cloudhsm.xml b/mdx/incommon/mdq-all-cloudhsm.xml
index 35a917d7..db3e85db 100644
--- a/mdx/incommon/mdq-all-cloudhsm.xml
+++ b/mdx/incommon/mdq-all-cloudhsm.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Generate and sign (using AWS CloudHSM) all metadata required by the InCommon MDQ service -->
 <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"
@@ -7,21 +8,14 @@
         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 inc-mda beans (from import.xml) -->
-    <import resource="classpath:uk/org/iay/incommon/mda/beans.xml" />
-
-    <!-- Import channel-specific beans -->
-    <import resource="classpath:incommon/beans.xml" />
-
-    <!-- Import mdq-all beans -->
+    <!-- Import generateAll and supporting beans -->
     <import resource="classpath:incommon/mdq-all.xml" />
 
+    <!-- Define a private key factory (based on AWS CloudHSM) to be used by the generateAll stage -->
     <bean id="privateKeyFactory" class="uk.org.iay.incommon.mda.cloudhsm.CaviumPrivateKeyFactoryBean"
         p:username="${sign.keyUser}" p:password="${sign.keyPassword}" p:keyHandle="${sign.keyHandle}" />
 
+    <!-- Generate all signed metadata required by the InCommon MDQ service  -->
     <bean id="mdq-all-cloudhsm" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
diff --git a/mdx/incommon/mdq-all-localkey.xml b/mdx/incommon/mdq-all-localkey.xml
index 01d1b22c..c2617cb6 100644
--- a/mdx/incommon/mdq-all-localkey.xml
+++ b/mdx/incommon/mdq-all-localkey.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Generate and sign (using a local key) all metadata required by the InCommon MDQ service -->
 <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"
@@ -7,21 +8,14 @@
         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 inc-mda beans (from import.xml) -->
-    <import resource="classpath:uk/org/iay/incommon/mda/beans.xml" />
-
-    <!-- Import channel-specific beans -->
-    <import resource="classpath:incommon/beans.xml" />
-
-    <!-- Import mdq-all beans -->
+    <!-- Import generateAll and supporting beans -->
     <import resource="classpath:incommon/mdq-all.xml" />
 
+    <!-- Define a private key factory (based on a local key) to be used by the generateAll stage -->
     <bean id="privateKeyFactory" parent="PrivateKeyFactoryBean" p:resource="${sign.keyResource}"
         p:privateKeyPassword="${sign.keyPassword}" />
 
+    <!-- Generate all signed metadata required by the InCommon MDQ service  -->
     <bean id="mdq-all-localkey" parent="mda.SimplePipeline">
         <property name="stages">
             <list>