diff --git a/build.xml b/build.xml
index 7005aac1..c0147fce 100644
--- a/build.xml
+++ b/build.xml
@@ -970,6 +970,7 @@
         <CHANNEL.do verb="importProduction" channel="fr_renater"/>
     	<CHANNEL.do verb="importProduction" channel="gr_grnet"/>
     	<CHANNEL.do verb="importProduction" channel="hu_eduid"/>
+    	<CHANNEL.do verb="importProduction" channel="ie_edugate"/>
     	<CHANNEL.do verb="importProduction" channel="in_infed"/>
     	<CHANNEL.do verb="importProduction" channel="it_idem"/>
     	<CHANNEL.do verb="importProduction" channel="lv_laife"/>
@@ -1011,7 +1012,7 @@
         
         Verify the eduGAIN entities from a particular channel.
         
-        The intention is that this be called from the command line
+        The intention is that this be called within Jenkins
         with the channel name passed as a property, e.g.:
         
             ant flow.verifyEdugain -Dchannel=se_swamid
@@ -1027,6 +1028,7 @@
         Verify the eduGAIN entities from all channels with this ability.
     -->
 	<target name="flow.verifyEdugain.all">
+        <CHANNEL.do verb="verifyEdugain" channel="at_aconet"/>
 		<CHANNEL.do verb="verifyEdugain" channel="se_swamid"/>
 	</target>
 	
diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 5a9717de..f6ef0a93 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -122,7 +122,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="at_aconet_productionEntities" parent="CompositeStage"
         p:id="at_aconet_productionEntities">
@@ -140,18 +140,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="at_aconet_edugainEntities" parent="CompositeStage"
         p:id="at_aconet_edugainEntities">
@@ -170,46 +164,8 @@
                 
                 <ref bean="disassemble"/>
                 
-                <ref bean="at_aconet_default_regauth"/>
-                <ref bean="at_aconet_check_regauth"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
-            </list>
-        </property>
-    </bean>
-    
-    <!--
-        Verify the entities in the eduGAIN export aggregate.
-    -->
-    <bean id="at_aconet_verifyEdugain" parent="CompositeStage"
-        p:id="at_aconet_verifyEdugain">
-        <property name="composedStages">
-            <list>
-                <ref bean="at_aconet_edugainAggregate"/>
-                
-                <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
-                -->
-                <ref bean="check_validUntil"/>
-                <ref bean="at_aconet_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
-                
-                <ref bean="disassemble"/>
-                
-                <ref bean="at_aconet_default_regauth"/>
+                <ref bean="check_hasreginfo"/>
                 <ref bean="at_aconet_check_regauth"/>
-                
-                <ref bean="standardVerifyActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index d123270d..e5acf639 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -77,7 +79,8 @@
         p:id="verifyEdugain">
         <property name="stages">
             <list>
-                <ref bean="at_aconet_verifyEdugain"/>
+                <ref bean="at_aconet_edugainEntities"/>
+                <ref bean="standardVerifyActions"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
index b28df637..d8a39aa9 100644
--- a/mdx/au_aaf/beans.xml
+++ b/mdx/au_aaf/beans.xml
@@ -46,7 +46,7 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the exported entities as a collection.
     -->
     <bean id="au_aaf_exportedEntities" parent="CompositeStage"
         p:id="au_aaf_exportedEntities">
@@ -65,12 +65,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
index d2ea2719..998f4045 100644
--- a/mdx/au_aaf/verbs.xml
+++ b/mdx/au_aaf/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="au_aaf_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
index a5c85825..cf0f5c4c 100644
--- a/mdx/be_belnet/beans.xml
+++ b/mdx/be_belnet/beans.xml
@@ -69,7 +69,7 @@
     </bean>
 
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="be_belnet_productionEntities" parent="CompositeStage"
         p:id="be_belnet_productionEntities">
@@ -87,18 +87,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="be_belnet_edugainEntities" parent="CompositeStage"
         p:id="be_belnet_edugainEntities">
@@ -116,12 +110,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
index 9c29e9ce..1fb86546 100644
--- a/mdx/be_belnet/verbs.xml
+++ b/mdx/be_belnet/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="be_belnet_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="be_belnet_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
index 1f9e6f03..2b09ea74 100644
--- a/mdx/br_cafe/beans.xml
+++ b/mdx/br_cafe/beans.xml
@@ -69,7 +69,7 @@
     </bean>
 
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="br_cafe_productionEntities" parent="CompositeStage"
         p:id="br_cafe_productionEntities">
@@ -86,18 +86,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="br_cafe_edugainEntities" parent="CompositeStage"
         p:id="br_cafe_edugainEntities">
@@ -115,12 +109,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
index 0e43d133..09310160 100644
--- a/mdx/br_cafe/verbs.xml
+++ b/mdx/br_cafe/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="br_cafe_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="br_cafe_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
index 059e1697..5967608b 100644
--- a/mdx/ca_caf/beans.xml
+++ b/mdx/ca_caf/beans.xml
@@ -93,7 +93,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="ca_caf_productionEntities" parent="CompositeStage"
         p:id="ca_caf_productionEntities">
@@ -111,18 +111,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="ca_caf_edugainEntities" parent="CompositeStage"
         p:id="ca_caf_edugainEntities">
@@ -140,12 +134,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
index 3241e337..97c5a63f 100644
--- a/mdx/ca_caf/verbs.xml
+++ b/mdx/ca_caf/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="ca_caf_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="ca_caf_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
index a26ca688..dab6cd95 100644
--- a/mdx/ch_switchaai/beans.xml
+++ b/mdx/ch_switchaai/beans.xml
@@ -89,7 +89,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="ch_switchaai_productionEntities" parent="CompositeStage"
         p:id="ch_switchaai_productionEntities">
@@ -107,18 +107,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="ch_switchaai_edugainEntities" parent="CompositeStage"
         p:id="ch_switchaai_edugainEntities">
@@ -136,12 +130,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/ch_switchaai/verbs.xml b/mdx/ch_switchaai/verbs.xml
index 830cf74d..604fac08 100644
--- a/mdx/ch_switchaai/verbs.xml
+++ b/mdx/ch_switchaai/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="ch_switchaai_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="ch_switchaai_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 83d222b2..c23601fe 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -643,6 +643,9 @@
                 <ref bean="stripUkfedlabelNamespace"/>
                 <ref bean="stripWayfNamespace"/>
                 
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+
                 <ref bean="cleanImport"/>
                 <ref bean="removeEmptyExtensions"/>
                 <ref bean="checkSchemas"/>
@@ -678,6 +681,9 @@
                 <ref bean="stripUkfedlabelNamespace"/>
                 <ref bean="stripWayfNamespace"/>
                 
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+
                 <ref bean="cleanImport"/>
                 <ref bean="removeEmptyExtensions"/>
                 <ref bean="checkSchemas"/>
diff --git a/mdx/conventions.md b/mdx/conventions.md
index 6a04f6fe..8b34e5c6 100644
--- a/mdx/conventions.md
+++ b/mdx/conventions.md
@@ -68,8 +68,10 @@ Most federations publish more than one metadata aggregate.  We use the following
 
 Aggregate names such as the above are used in the construction of bean names:
 
-* `channel_xxxAggregate` is a stage that fetches the channel's `xxx` aggregate.
-* `channel_xxxEntities` is a stage that fetches the channel's `xxx` aggregate, disassembles it into a collection of entites and then processes those entities for UK federation consumption.
+* `channel_xxxAggregate` is a composite stage that fetches the channel's `xxx` aggregate.  The result will normally be a single `DomDocumentItem` whose document element is an `EntitiesDescriptor`.  Execution will be terminated via `errorTerminatingFilter` if, for example, the signature does not verify.
+* `channel_xxxEntities` is a composite stage that fetches the channel's `xxx` aggregate, checks that aggregate's global properties (signature, validity) and then disassembles it into a collection of entites each represented by a `DomDocumentItem` whose document element is an `EntityDescriptor`.  Channel-specific rules such as presence of and appropriate values for `registrationAuthority` are checked but not enforced by this stage.  Channel-independent checks and the enforcement of all checks (announcement, filtering or termination) are the responsibility of the caller.
+
+**Note:** The conventions around which part of the system are responsible for performing and enforcing checks were changed around 2013-08-12.  Previously, `channel_xxxEntities` beans both performed checks and enforced them.  Now, `beans.xml` beans perform only channel-specific checks and never enforce.  In most cases, this means the movement of `standardImportActions` and `stripMdattrNamespace` from the `...Entities` bean to all callers.  `stripMdattrNamespace` has therefore been included in both `standardImportActions` and `standardVerifyActions` to make this transition simpler.
 
 As well as the physical aggregates published by a federation, the name `exported` is used (as for example in the bean name `channel_exportedEntities`) to represent the aggregate that either is that used for import by the UK federation, or is closest in spirit to that purpose.  This aggregate is usually selected as follows, in descending order of preference:
 
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
index 6a32befe..4248c0f4 100644
--- a/mdx/cz_eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -86,7 +86,7 @@
         p:namespace="http://eduid.cz/schema/metadata/1.0"/>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="cz_eduid_productionEntities" parent="CompositeStage"
         p:id="cz_eduid_productionEntities">
@@ -106,18 +106,12 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="cz_eduid_stripMetadataNamespace"/>
-
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="cz_eduid_edugainEntities" parent="CompositeStage"
         p:id="cz_eduid_edugainEntities">
@@ -137,12 +131,6 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="cz_eduid_stripMetadataNamespace"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/cz_eduid/verbs.xml b/mdx/cz_eduid/verbs.xml
index cf4804bd..ca67fda7 100644
--- a/mdx/cz_eduid/verbs.xml
+++ b/mdx/cz_eduid/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="cz_eduid_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="cz_eduid_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
index 2ed04914..bdf8107a 100644
--- a/mdx/de_dfnaai/beans.xml
+++ b/mdx/de_dfnaai/beans.xml
@@ -69,7 +69,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="de_dfnaai_productionEntities" parent="CompositeStage"
         p:id="de_dfnaai_productionEntities">
@@ -87,18 +87,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="de_dfnaai_edugainEntities" parent="CompositeStage"
         p:id="de_dfnaai_edugainEntities">
@@ -116,12 +110,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/de_dfnaai/verbs.xml b/mdx/de_dfnaai/verbs.xml
index 31fcf339..34bf8cd4 100644
--- a/mdx/de_dfnaai/verbs.xml
+++ b/mdx/de_dfnaai/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="de_dfnaai_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="de_dfnaai_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
index 095f803e..9ecfc197 100644
--- a/mdx/dk_wayf/beans.xml
+++ b/mdx/dk_wayf/beans.xml
@@ -129,7 +129,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="dk_wayf_productionEntities" parent="CompositeStage"
         p:id="dk_wayf_productionEntities">
@@ -142,18 +142,12 @@
                 <!-- hub singleton IdP and SP metadata -->
                 <ref bean="dk_wayf_idpMetadata"/>
                 <ref bean="dk_wayf_spMetadata"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="dk_wayf_edugainEntities" parent="CompositeStage"
         p:id="dk_wayf_edugainEntities">
@@ -171,12 +165,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/dk_wayf/verbs.xml b/mdx/dk_wayf/verbs.xml
index f1b34bc0..08d8b2c8 100644
--- a/mdx/dk_wayf/verbs.xml
+++ b/mdx/dk_wayf/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="dk_wayf_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="dk_wayf_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
index c7b9f556..4d594a81 100644
--- a/mdx/es_sir/beans.xml
+++ b/mdx/es_sir/beans.xml
@@ -69,7 +69,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="es_sir_productionEntities" parent="CompositeStage"
         p:id="es_sir_productionEntities">
@@ -87,18 +87,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="es_sir_edugainEntities" parent="CompositeStage"
         p:id="es_sir_edugainEntities">
@@ -120,12 +114,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/es_sir/verbs.xml b/mdx/es_sir/verbs.xml
index 897336eb..52e6eaf8 100644
--- a/mdx/es_sir/verbs.xml
+++ b/mdx/es_sir/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="es_sir_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="es_sir_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/eu_clarin/beans.xml b/mdx/eu_clarin/beans.xml
index c76bcf75..54aebcfe 100644
--- a/mdx/eu_clarin/beans.xml
+++ b/mdx/eu_clarin/beans.xml
@@ -26,7 +26,7 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the exported entities as a collection.
     -->
     <bean id="eu_clarin_exportedEntities" parent="CompositeStage"
         p:id="eu_clarin_exportedEntities">
@@ -49,11 +49,6 @@
                 -->
                 
                 <ref bean="disassemble"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/eu_clarin/verbs.xml b/mdx/eu_clarin/verbs.xml
index f2b6dd64..c9ee5bc0 100644
--- a/mdx/eu_clarin/verbs.xml
+++ b/mdx/eu_clarin/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="eu_clarin_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
index 34a84487..20fb30e4 100644
--- a/mdx/fi_haka/beans.xml
+++ b/mdx/fi_haka/beans.xml
@@ -89,7 +89,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="fi_haka_productionEntities" parent="CompositeStage"
         p:id="fi_haka_productionEntities">
@@ -107,18 +107,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="fi_haka_edugainEntities" parent="CompositeStage"
         p:id="fi_haka_edugainEntities">
@@ -136,12 +130,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/fi_haka/verbs.xml b/mdx/fi_haka/verbs.xml
index ead07e16..3a5e13a9 100644
--- a/mdx/fi_haka/verbs.xml
+++ b/mdx/fi_haka/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="fi_haka_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="fi_haka_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
index 24734f5e..2234b1bf 100644
--- a/mdx/fr_renater/beans.xml
+++ b/mdx/fr_renater/beans.xml
@@ -144,7 +144,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="fr_renater_productionEntities" parent="CompositeStage"
         p:id="fr_renater_productionEntities">
@@ -163,21 +163,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="fr_renater_default_regauth"/>
-                <ref bean="fr_renater_check_regauth"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
 
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="fr_renater_edugainEntities" parent="CompositeStage"
         p:id="fr_renater_edugainEntities">
@@ -199,12 +190,6 @@
                 
                 <ref bean="fr_renater_default_regauth"/>
                 <ref bean="fr_renater_check_regauth"/>
-
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/fr_renater/verbs.xml b/mdx/fr_renater/verbs.xml
index 81018363..10e0e408 100644
--- a/mdx/fr_renater/verbs.xml
+++ b/mdx/fr_renater/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="fr_renater_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="fr_renater_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
index 6731c6d5..95b3136b 100644
--- a/mdx/gr_grnet/beans.xml
+++ b/mdx/gr_grnet/beans.xml
@@ -69,7 +69,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="gr_grnet_productionEntities" parent="CompositeStage"
         p:id="gr_grnet_productionEntities">
@@ -87,18 +87,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="gr_grnet_edugainEntities" parent="CompositeStage"
         p:id="gr_grnet_edugainEntities">
@@ -116,12 +110,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/gr_grnet/verbs.xml b/mdx/gr_grnet/verbs.xml
index e9d7b7b5..9f961063 100644
--- a/mdx/gr_grnet/verbs.xml
+++ b/mdx/gr_grnet/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="gr_grnet_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="gr_grnet_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
index cc6b2dea..04ba99fa 100644
--- a/mdx/hr_eduhr/beans.xml
+++ b/mdx/hr_eduhr/beans.xml
@@ -92,7 +92,7 @@
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="hr_eduhr_edugainEntities" parent="CompositeStage"
         p:id="hr_eduhr_edugainEntities">
@@ -117,12 +117,6 @@
                 
                 <ref bean="hr_eduhr_default_regauth"/>
                 <ref bean="hr_eduhr_check_regauth"/>
-
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/hr_eduhr/verbs.xml b/mdx/hr_eduhr/verbs.xml
index 8cd16b82..81a7162e 100644
--- a/mdx/hr_eduhr/verbs.xml
+++ b/mdx/hr_eduhr/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="hr_eduhr_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
index bf4f914d..8a1d36b2 100644
--- a/mdx/hu_eduid/beans.xml
+++ b/mdx/hu_eduid/beans.xml
@@ -100,7 +100,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="hu_eduid_productionEntities" parent="CompositeStage"
         p:id="hu_eduid_productionEntities">
@@ -122,17 +122,12 @@
                 <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
                 
                 <ref bean="hu_eduid_check_regauth"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="hu_eduid_edugainEntities" parent="CompositeStage"
         p:id="hu_eduid_edugainEntities">
@@ -154,11 +149,6 @@
                 <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
                 
                 <ref bean="hu_eduid_check_regauth"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/hu_eduid/verbs.xml b/mdx/hu_eduid/verbs.xml
index 2fe1aa14..6de6e564 100644
--- a/mdx/hu_eduid/verbs.xml
+++ b/mdx/hu_eduid/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="hu_eduid_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="hu_eduid_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index 5570cbcc..13b2513c 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -118,10 +118,10 @@
     </bean>
     
     <!--
-        Fetch and process all entities as a collection.
+        Fetch production entities as a collection.
     -->
-    <bean id="ie_edugate_allEntities" parent="CompositeStage"
-        p:id="ie_edugate_allEntities">
+    <bean id="ie_edugate_productionEntities" parent="CompositeStage"
+        p:id="ie_edugate_productionEntities">
         <property name="composedStages">
             <list>
                 <ref bean="ie_edugate_productionAggregate"/>
@@ -138,17 +138,12 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="ie_edugate_check_regauth"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the exported entities as a collection.
     -->
     <bean id="ie_edugate_exportedEntities" parent="CompositeStage"
         p:id="ie_edugate_exportedEntities">
@@ -169,11 +164,6 @@
                 
                 <ref bean="ie_edugate_default_regauth"/>
                 <ref bean="ie_edugate_check_regauth"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/ie_edugate/verbs.xml b/mdx/ie_edugate/verbs.xml
index 6d92bcb1..5f3f61d2 100644
--- a/mdx/ie_edugate/verbs.xml
+++ b/mdx/ie_edugate/verbs.xml
@@ -36,25 +36,27 @@
         <property name="stages">
             <list>
                 <ref bean="ie_edugate_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
     
-    <bean id="importAll" parent="SimplePipeline"
-        p:id="importAll">
+    <bean id="importProduction" parent="SimplePipeline"
+        p:id="importProduction">
         <property name="stages">
             <list>
-                <ref bean="ie_edugate_allEntities"/>
+                <ref bean="ie_edugate_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
     
-    <bean id="importRaw" parent="SimplePipeline"
-        p:id="importRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="ie_edugate_productionAggregate"/>
diff --git a/mdx/in_infed/beans.xml b/mdx/in_infed/beans.xml
index 064d4289..81211fe8 100644
--- a/mdx/in_infed/beans.xml
+++ b/mdx/in_infed/beans.xml
@@ -33,13 +33,12 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="in_infed_productionEntities" parent="CompositeStage"
         p:id="in_infed_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="in_infed_productionAggregate"/>
                 
                 <!--
@@ -54,12 +53,6 @@
                 -->
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/in_infed/verbs.xml b/mdx/in_infed/verbs.xml
index 1e723a7d..1be57383 100644
--- a/mdx/in_infed/verbs.xml
+++ b/mdx/in_infed/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="in_infed_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index ea3424c3..d8228aef 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -65,7 +65,7 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the exported entities as a collection.
     -->
     <bean id="int_edugain_exportedEntities" parent="CompositeStage"
         p:id="int_edugain_exportedEntities">
@@ -95,18 +95,12 @@
                     we can't check the actual values.
                 -->
                 <ref bean="check_hasreginfo"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the test entities as a collection.
+        Fetch the test entities as a collection.
     -->
     <bean id="int_edugain_testEntities" parent="CompositeStage"
         p:id="int_edugain_testEntities">
@@ -136,12 +130,6 @@
                     we can't check the actual values.
                 -->
                 <ref bean="check_hasreginfo"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index e480a724..8a753215 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="int_edugain_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="int_edugain_testEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/int_testshib/beans.xml b/mdx/int_testshib/beans.xml
index e3b165e9..a51a18de 100644
--- a/mdx/int_testshib/beans.xml
+++ b/mdx/int_testshib/beans.xml
@@ -33,7 +33,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="int_testshib_productionEntities" parent="CompositeStage"
         p:id="int_testshib_productionEntities">
@@ -42,12 +42,6 @@
                 <ref bean="int_testshib_productionAggregate"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/int_testshib/verbs.xml b/mdx/int_testshib/verbs.xml
index 2a70799b..ae0633a2 100644
--- a/mdx/int_testshib/verbs.xml
+++ b/mdx/int_testshib/verbs.xml
@@ -39,6 +39,7 @@
         <property name="stages">
             <list>
                 <ref bean="int_testshib_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index e887f720..7c2c84fb 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -69,7 +69,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="it_idem_productionEntities" parent="CompositeStage"
         p:id="it_idem_productionEntities">
@@ -87,18 +87,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="it_idem_edugainEntities" parent="CompositeStage"
         p:id="it_idem_edugainEntities">
@@ -116,12 +110,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/it_idem/verbs.xml b/mdx/it_idem/verbs.xml
index d11edd7f..b36d97e6 100644
--- a/mdx/it_idem/verbs.xml
+++ b/mdx/it_idem/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="it_idem_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="it_idem_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
index 8e448649..6e9b2428 100644
--- a/mdx/jp_gakunin/beans.xml
+++ b/mdx/jp_gakunin/beans.xml
@@ -46,13 +46,12 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the production entities as a collection.
     -->
-    <bean id="jp_gakunin_exportedEntities" parent="CompositeStage"
-        p:id="jp_gakunin_exportedEntities">
+    <bean id="jp_gakunin_productionEntities" parent="CompositeStage"
+        p:id="jp_gakunin_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="jp_gakunin_productionAggregate"/>
 
                 <!--
@@ -65,12 +64,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/jp_gakunin/verbs.xml b/mdx/jp_gakunin/verbs.xml
index 7b69ba0a..47a52e10 100644
--- a/mdx/jp_gakunin/verbs.xml
+++ b/mdx/jp_gakunin/verbs.xml
@@ -31,19 +31,20 @@
         </property>
     </bean>
     
-    <bean id="import" parent="SimplePipeline"
-        p:id="import">
+    <bean id="importProduction" parent="SimplePipeline"
+        p:id="importProduction">
         <property name="stages">
             <list>
                 <ref bean="jp_gakunin_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
 
-    <bean id="importRaw" parent="SimplePipeline"
-        p:id="importRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="jp_gakunin_productionAggregate"/>
diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
index 93e3d2b4..b7a4cbb3 100644
--- a/mdx/lv_laife/beans.xml
+++ b/mdx/lv_laife/beans.xml
@@ -72,7 +72,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="lv_laife_productionEntities" parent="CompositeStage"
         p:id="lv_laife_productionEntities">
@@ -90,18 +90,12 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="lv_laife_edugainEntities" parent="CompositeStage"
         p:id="lv_laife_edugainEntities">
@@ -119,12 +113,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/lv_laife/verbs.xml b/mdx/lv_laife/verbs.xml
index 7c845f70..07be0cd9 100644
--- a/mdx/lv_laife/verbs.xml
+++ b/mdx/lv_laife/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="lv_laife_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="lv_laife_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/nl_surfconext/beans.xml b/mdx/nl_surfconext/beans.xml
index 85250402..beedd21e 100644
--- a/mdx/nl_surfconext/beans.xml
+++ b/mdx/nl_surfconext/beans.xml
@@ -67,7 +67,7 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the exported entities as a collection.
     -->
     <bean id="nl_surfconext_exportedEntities" parent="CompositeStage"
         p:id="nl_surfconext_exportedEntities">
@@ -90,11 +90,6 @@
                 <!-- SP singleton -->
                 <ref bean="nl_surfconext_spAggregate"/>
                 <ref bean="disassemble"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/nl_surfconext/verbs.xml b/mdx/nl_surfconext/verbs.xml
index 5977e8bd..853eb917 100644
--- a/mdx/nl_surfconext/verbs.xml
+++ b/mdx/nl_surfconext/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="nl_surfconext_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index 048a4b44..2456cc4b 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -79,7 +79,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
         
         Fake this up by combining separate IdP and SP aggregates.
     -->
@@ -101,17 +101,12 @@
                 <!-- SP singleton -->
                 <ref bean="nl_surfnet_spAggregate"/>
                 <ref bean="disassemble"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="nl_surfnet_edugainEntities" parent="CompositeStage"
         p:id="nl_surfnet_edugainEntities">
@@ -129,12 +124,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/nl_surfnet/verbs.xml b/mdx/nl_surfnet/verbs.xml
index c15c2f60..c1df48c8 100644
--- a/mdx/nl_surfnet/verbs.xml
+++ b/mdx/nl_surfnet/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="nl_surfnet_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -66,6 +67,7 @@
         <property name="stages">
             <list>
                 <ref bean="nl_surfnet_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
index 0d21ab9a..a73b7ebc 100644
--- a/mdx/no_feide/beans.xml
+++ b/mdx/no_feide/beans.xml
@@ -35,7 +35,7 @@
     </bean>
     
     <!--
-        Fetch the prodiction aggregate.
+        Fetch the production aggregate.
         
         There isn't one of these, so make one by wrapping the IdP metadata.
     -->
@@ -83,18 +83,13 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the exported entities as a collection.
     -->
     <bean id="no_feide_productionEntities" parent="CompositeStage"
         p:id="no_feide_productionEntities">
         <property name="composedStages">
             <list>
                 <ref bean="no_feide_idpMetadata"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
@@ -118,12 +113,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/no_feide/verbs.xml b/mdx/no_feide/verbs.xml
index aa807b0b..03a0e51e 100644
--- a/mdx/no_feide/verbs.xml
+++ b/mdx/no_feide/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="no_feide_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="no_feide_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
index 54794fea..d599ecb7 100644
--- a/mdx/nz_tuakiri/beans.xml
+++ b/mdx/nz_tuakiri/beans.xml
@@ -46,13 +46,12 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the production entities as a collection.
     -->
-    <bean id="nz_tuakiri_exportedEntities" parent="CompositeStage"
-        p:id="nz_tuakiri_exportedEntities">
+    <bean id="nz_tuakiri_productionEntities" parent="CompositeStage"
+        p:id="nz_tuakiri_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="nz_tuakiri_productionAggregate"/>
                 
                 <!--
@@ -65,12 +64,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/nz_tuakiri/verbs.xml b/mdx/nz_tuakiri/verbs.xml
index 7ee365f6..7d39dc9f 100644
--- a/mdx/nz_tuakiri/verbs.xml
+++ b/mdx/nz_tuakiri/verbs.xml
@@ -31,19 +31,20 @@
         </property>
     </bean>
     
-    <bean id="import" parent="SimplePipeline"
-        p:id="import">
+    <bean id="importProduction" parent="SimplePipeline"
+        p:id="importProduction">
         <property name="stages">
             <list>
                 <ref bean="nz_tuakiri_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
 
-    <bean id="importRaw" parent="SimplePipeline"
-        p:id="importRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="nz_tuakiri_productionAggregate"/>
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 215bef5a..506ef842 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -114,7 +114,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="se_swamid_productionEntities" parent="CompositeStage"
         p:id="se_swamid_productionEntities">
@@ -145,18 +145,12 @@
                 -->
                 <ref bean="cz_eduid_stripMetadataNamespace"/>
                 <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
     
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="se_swamid_edugainEntities" parent="CompositeStage"
         p:id="se_swamid_edugainEntities">
@@ -177,44 +171,6 @@
                 
                 <ref bean="se_swamid_default_regauth"/>
                 <ref bean="se_swamid_check_regauth"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
-            </list>
-        </property>
-    </bean>
-    
-    <!--
-        Verify the entities in the eduGAIN export aggregate.
-    -->
-    <bean id="se_swamid_verifyEdugain" parent="CompositeStage"
-        p:id="se_swamid_verifyEdugain">
-        <property name="composedStages">
-            <list>
-                <ref bean="se_swamid_edugainAggregate"/>
-                
-                <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
-                -->
-                <ref bean="check_validUntil"/>
-                <ref bean="se_swamid_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
-                
-                <ref bean="disassemble"/>
-                
-                <ref bean="se_swamid_default_regauth"/>
-                <ref bean="se_swamid_check_regauth"/>
-                
-                <ref bean="standardVerifyActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/se_swamid/verbs.xml b/mdx/se_swamid/verbs.xml
index 735be33b..b9a94af4 100644
--- a/mdx/se_swamid/verbs.xml
+++ b/mdx/se_swamid/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="se_swamid_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="se_swamid_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -77,7 +79,8 @@
         p:id="verifyEdugain">
         <property name="stages">
             <list>
-                <ref bean="se_swamid_verifyEdugain"/>
+                <ref bean="se_swamid_edugainEntities"/>
+                <ref bean="standardVerifyActions"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
index 87d6f21d..b8a36bc6 100644
--- a/mdx/si_arnes/beans.xml
+++ b/mdx/si_arnes/beans.xml
@@ -46,13 +46,12 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch and process the production entities as a collection.
     -->
-    <bean id="si_arnes_exportedEntities" parent="CompositeStage"
-        p:id="si_arnes_exportedEntities">
+    <bean id="si_arnes_productionEntities" parent="CompositeStage"
+        p:id="si_arnes_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="si_arnes_productionAggregate"/>
 
                 <!--
@@ -70,12 +69,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/si_arnes/verbs.xml b/mdx/si_arnes/verbs.xml
index 998e0d5a..57510b19 100644
--- a/mdx/si_arnes/verbs.xml
+++ b/mdx/si_arnes/verbs.xml
@@ -31,19 +31,20 @@
         </property>
     </bean>
     
-    <bean id="import" parent="SimplePipeline"
-        p:id="import">
+    <bean id="importProduction" parent="SimplePipeline"
+        p:id="importProduction">
         <property name="stages">
             <list>
-                <ref bean="si_arnes_exportedEntities"/>
+                <ref bean="si_arnes_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
 
-    <bean id="importRaw" parent="SimplePipeline"
-        p:id="importRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="si_arnes_productionAggregate"/>
diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
index d5f495ed..a824607e 100644
--- a/mdx/test/beans.xml
+++ b/mdx/test/beans.xml
@@ -35,11 +35,6 @@
             <list>
                 <ref bean="test_aggregate"/>
                 <ref bean="disassemble"/>
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index 36bdae84..2a7e934c 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="test_entities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 68ed010e..56d0cafe 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -531,7 +531,7 @@
     -->
     
     <!--
-        Fetch and process the export entities as a collection.
+        Fetch the export entities as a collection.
     -->
     <bean id="uk_exportedEntities" parent="CompositeStage"
         p:id="uk_exportedEntities">
@@ -552,12 +552,6 @@
                 
                 <ref bean="uk_default_regauth"/>
                 <ref bean="uk_check_regauth"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index e0552bb4..881b910b 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -224,6 +224,7 @@
         <property name="composedStages">
             <list>
                 <ref bean="removeUKEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="uk_fix_mailto"/>
                 <ref bean="uk_hide_idps"/>
             </list>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index e3f0b1de..f45f3dfd 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -328,6 +328,7 @@
         <property name="stages">
             <list>
                 <ref bean="uk_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
index 9a07e906..746b7f7e 100644
--- a/mdx/uk_eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -46,7 +46,7 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the exported entities as a collection.
     -->
     <bean id="uk_eduserv_exportedEntities" parent="CompositeStage"
         p:id="uk_eduserv_exportedEntities">
@@ -69,12 +69,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/uk_eduserv/verbs.xml b/mdx/uk_eduserv/verbs.xml
index 00162aba..93bee2a0 100644
--- a/mdx/uk_eduserv/verbs.xml
+++ b/mdx/uk_eduserv/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="uk_eduserv_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index c1b63509..5afde8ec 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -95,7 +95,7 @@
     </bean>
     
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="us_incommon_productionEntities" parent="CompositeStage"
         p:id="us_incommon_productionEntities">
@@ -113,18 +113,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
-                <ref bean="us_incommon_check_regauth"/>
-                <ref bean="standardImportActions"/>
-
-                <!--
-                    Strip all entity attributes from this source.
-                    
-                    TODO rewrite this so that we preserve things like the
-                    InCommon R+S category membership designation.
-                -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
@@ -197,17 +185,6 @@
                 <!-- default and check registrar -->
                 <ref bean="us_incommon_default_regauth"/>
                 <ref bean="us_incommon_check_regauth"/>
-
-                <ref bean="standardImportActions"/>
-                
-                <!--
-                    Strip all entity attributes from this source.
-                    
-                    TODO rewrite this so that we preserve things like the
-                    InCommon R+S category membership designation.
-                -->
-                <ref bean="stripMdattrNamespace"/>
-                
             </list>
         </property>
     </bean>
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index 83f47542..ed5cf739 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -39,6 +39,7 @@
         <property name="stages">
             <list>
                 <ref bean="us_incommon_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -60,6 +61,7 @@
         <property name="stages">
             <list>
                 <ref bean="us_incommon_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>