diff --git a/build.xml b/build.xml
index 2dcd0db2..382b18ee 100644
--- a/build.xml
+++ b/build.xml
@@ -84,7 +84,6 @@
     <property name="tools.dir" value="tools"/>
     <property name="tools.ant" value="${tools.dir}/ant"/>
     <property name="tools.mda" value="${tools.dir}/aggregator-cli-0.9.0"/>
-    <property name="tools.mda.old" value="${tools.dir}/aggregator-cli-0.8.0"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
     <property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
     <property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>
@@ -462,7 +461,7 @@
         The individual properties listed here can be augmented or overridden
         by properties defined in the external properties files, e.g., build.properties.
     -->
-    <property name="mda.java.endorsed.dirs" value="${tools.mda.old}/lib/endorsed"/>
+    <property name="mda.java.endorsed.dirs" value="${tools.dir}/endorsed"/>
     <property name="mda.basedir" value="${basedir}"/>
 
     <!--
diff --git a/tools/aggregator-cli-0.8.0/cpappend.bat b/tools/aggregator-cli-0.8.0/cpappend.bat
deleted file mode 100644
index bafe1398..00000000
--- a/tools/aggregator-cli-0.8.0/cpappend.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-rem ---------------------------------------------------------------------------
-rem Append to CLASSPATH
-rem ---------------------------------------------------------------------------
-
-rem Process the first argument
-if ""%1"" == """" goto end
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%1
-shift
-
-rem Process the remaining arguments
-:setArgs
-if ""%1"" == """" goto doneSetArgs
-set LOCALCLASSPATH=%LOCALCLASSPATH% %1
-shift
-goto setArgs
-:doneSetArgs
-:end
diff --git a/tools/aggregator-cli-0.8.0/doc/LICENSE.txt b/tools/aggregator-cli-0.8.0/doc/LICENSE.txt
deleted file mode 100644
index d6456956..00000000
--- a/tools/aggregator-cli-0.8.0/doc/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/tools/aggregator-cli-0.8.0/doc/RELEASE-NOTES.txt b/tools/aggregator-cli-0.8.0/doc/RELEASE-NOTES.txt
deleted file mode 100644
index 641e4849..00000000
--- a/tools/aggregator-cli-0.8.0/doc/RELEASE-NOTES.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Release Notes - Metadata Aggregator - Version 0.8.0
-===================================================
-
-Highlights
-   * API changes for new Shibboleth coding conventions, and in the
-     use of generic types
-   * Signature validation can reject empty references, blacklist
-     algorithm URIs and protects against "wrapping" attacks.
-   * New stage to extract MDRPI registrationInfo into item metadata.
-   * Moved to Java 7, Apache Santuario V1.5
-   * Improved CLI experience
-   * bug fixes
-
-   
-API Changes
-   * DomElementItem becomes DOMElementItem
-   * DomElementSerializer becomes DOMElementSerializer
-   * DomFilesystemSourceStage becomes DOMFilesystemSourceStage
-   * DomResourceSourceStage becomes DOMResourceSourceStage
-   * domResource bean properties become DOMResource
-      * getDomResource becomes getDOMResource
-      * setDomResource becomes setDOMResource
-   * xpathExpression bean properties become XPathResource
-      * getXpathExpression becomes getXPathExpression
-      * setXpathExpression becomes setXPathExpression
-   * xslResource bean properties become XSLResource
-      * getXslResource becomes getXSLResource
-      * setXslResource becomes setXSLResource
-   * BaseDomTest test class becomes BaseDOMTest
-   * Stages and Pipelines with generic types are parameterised by the
-     type *wrapped* in the Item, not the implementation type.  For example,
-     you would now use a Stage<Element> rather than a Stage<DOMElementItem>
-   * Most internal Stage APIs have been changed in a similar way.  For example,
-     Collection<DOMElementItem> would become Collection<Item<Element>>.
-   * The generic type changes mean that the DOM-based stages can work over any
-     class implementing Item<Element>, not just the supplied DOMElementItem.
-
-
-** Bug
-    * [MDA-44] - exceptions should be propagated up from subordinate pipelines
-    * [MDA-81] - address multiple failed tests
-    * [MDA-83] - PullUpCacheDurationStage ignores cacheDuration on EntityDescriptor elements
-    * [MDA-87] - EntitiesDescriptorAssemblerStage does not declare namespace prefix
-    * [MDA-90] - default identifier strategy used by GenerateIdStage sometimes generates bad IDs
-    * [MDA-98] - review use of debug vs. trace logging in aggregator stages
-    * [MDA-101] - XMLSignatureSigningStage does not work under Santuario 1.5.x
-    * [MDA-112] - signature validation stage should protect against wrapping attacks
-
-** Improvement
-    * [MDA-66] - should be possible to have CLI termination without a stack dump
-    * [MDA-85] - Guava Closeables.closeQuietly is deprecated
-    * [MDA-86] - tests shouldn't pull UK production metadata
-    * [MDA-89] - add license and release notes to aggregator-cli package
-    * [MDA-95] - API changes for new Shibboleth coding conventions
-    * [MDA-111] - bundle spring-extensions in MDA cli package
-    * [MDA-113] - improve use of generic types internally and in API
-    * [MDA-118] - correct double initialisation of ID attribute list in signing stage
-
-** New Feature
-    * [MDA-88] - assist debugging of signature creation by making pre-digest data available
-    * [MDA-91] - allow checking that SAML metadata is signed using ID, not empty reference
-    * [MDA-102] - allow configuration of URI resolver for XSLT stages
-    * [MDA-120] - signature validation stage should allow algorithm blacklisting
-    * [MDA-121] - add stage to extract mdrpi registrationAuthority value into item metadata
-
-** Task
-    * [MDA-68] - Convert command line interface to use JCommander
-    * [MDA-70] - Move ClassToInstanceMultiMap to java-support
-    * [MDA-80] - compile using, and require, Java 7
-    * [MDA-107] - release process for MDA 0.8.0
-    * [MDA-108] - make use of Java 7 type inference
diff --git a/tools/aggregator-cli-0.8.0/lib/aggregator-cli-0.8.0.jar b/tools/aggregator-cli-0.8.0/lib/aggregator-cli-0.8.0.jar
deleted file mode 100644
index 96827f07..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/aggregator-cli-0.8.0.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/aggregator-pipeline-0.8.0.jar b/tools/aggregator-cli-0.8.0/lib/aggregator-pipeline-0.8.0.jar
deleted file mode 100644
index 971bfc6f..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/aggregator-pipeline-0.8.0.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/aopalliance-1.0.jar b/tools/aggregator-cli-0.8.0/lib/aopalliance-1.0.jar
deleted file mode 100644
index 578b1a0c..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/aopalliance-1.0.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/bcprov-jdk15-1.45.jar b/tools/aggregator-cli-0.8.0/lib/bcprov-jdk15-1.45.jar
deleted file mode 100644
index 409070b0..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/bcprov-jdk15-1.45.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/commons-codec-1.7.jar b/tools/aggregator-cli-0.8.0/lib/commons-codec-1.7.jar
deleted file mode 100644
index efa7f729..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/commons-codec-1.7.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/guava-14.0.1.jar b/tools/aggregator-cli-0.8.0/lib/guava-14.0.1.jar
deleted file mode 100644
index 3a3d9258..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/guava-14.0.1.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/httpclient-4.3.1.jar b/tools/aggregator-cli-0.8.0/lib/httpclient-4.3.1.jar
deleted file mode 100644
index cdd1e387..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/httpclient-4.3.1.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/httpcore-4.3.jar b/tools/aggregator-cli-0.8.0/lib/httpcore-4.3.jar
deleted file mode 100644
index ddfe6dac..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/httpcore-4.3.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/java-support-2.0.1.jar b/tools/aggregator-cli-0.8.0/lib/java-support-2.0.1.jar
deleted file mode 100644
index a47c1f8e..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/java-support-2.0.1.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/jcl-over-slf4j-1.7.5.jar b/tools/aggregator-cli-0.8.0/lib/jcl-over-slf4j-1.7.5.jar
deleted file mode 100644
index 90153b06..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/jcl-over-slf4j-1.7.5.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/jcommander-1.30.jar b/tools/aggregator-cli-0.8.0/lib/jcommander-1.30.jar
deleted file mode 100644
index ec6c420a..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/jcommander-1.30.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/joda-time-2.2.jar b/tools/aggregator-cli-0.8.0/lib/joda-time-2.2.jar
deleted file mode 100644
index 69fa9240..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/joda-time-2.2.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/jsr305-1.3.9.jar b/tools/aggregator-cli-0.8.0/lib/jsr305-1.3.9.jar
deleted file mode 100644
index a9afc661..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/jsr305-1.3.9.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/jul-to-slf4j-1.7.5.jar b/tools/aggregator-cli-0.8.0/lib/jul-to-slf4j-1.7.5.jar
deleted file mode 100644
index 9b5e8c1a..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/jul-to-slf4j-1.7.5.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/log4j-over-slf4j-1.7.5.jar b/tools/aggregator-cli-0.8.0/lib/log4j-over-slf4j-1.7.5.jar
deleted file mode 100644
index 3f303968..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/log4j-over-slf4j-1.7.5.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/logback-classic-1.0.11.jar b/tools/aggregator-cli-0.8.0/lib/logback-classic-1.0.11.jar
deleted file mode 100644
index 5ae700f1..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/logback-classic-1.0.11.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/logback-core-1.0.11.jar b/tools/aggregator-cli-0.8.0/lib/logback-core-1.0.11.jar
deleted file mode 100644
index ec4f6b47..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/logback-core-1.0.11.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/slf4j-api-1.7.5.jar b/tools/aggregator-cli-0.8.0/lib/slf4j-api-1.7.5.jar
deleted file mode 100644
index 8f004d39..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/slf4j-api-1.7.5.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/spring-aop-3.2.5.RELEASE.jar b/tools/aggregator-cli-0.8.0/lib/spring-aop-3.2.5.RELEASE.jar
deleted file mode 100644
index c0cf9fa6..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/spring-aop-3.2.5.RELEASE.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/spring-beans-3.2.5.RELEASE.jar b/tools/aggregator-cli-0.8.0/lib/spring-beans-3.2.5.RELEASE.jar
deleted file mode 100644
index 6463da0d..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/spring-beans-3.2.5.RELEASE.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/spring-context-3.2.5.RELEASE.jar b/tools/aggregator-cli-0.8.0/lib/spring-context-3.2.5.RELEASE.jar
deleted file mode 100644
index 6d4469a1..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/spring-context-3.2.5.RELEASE.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/spring-core-3.2.5.RELEASE.jar b/tools/aggregator-cli-0.8.0/lib/spring-core-3.2.5.RELEASE.jar
deleted file mode 100644
index fcdde24a..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/spring-core-3.2.5.RELEASE.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/spring-expression-3.2.5.RELEASE.jar b/tools/aggregator-cli-0.8.0/lib/spring-expression-3.2.5.RELEASE.jar
deleted file mode 100644
index 2878d0f7..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/spring-expression-3.2.5.RELEASE.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/spring-extensions-1.1.0.jar b/tools/aggregator-cli-0.8.0/lib/spring-extensions-1.1.0.jar
deleted file mode 100644
index b7460cc7..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/spring-extensions-1.1.0.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/vt-crypt-2.2.jar b/tools/aggregator-cli-0.8.0/lib/vt-crypt-2.2.jar
deleted file mode 100644
index 5231cc0d..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/vt-crypt-2.2.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/lib/xmlsec-1.5.4.jar b/tools/aggregator-cli-0.8.0/lib/xmlsec-1.5.4.jar
deleted file mode 100644
index 06615c18..00000000
Binary files a/tools/aggregator-cli-0.8.0/lib/xmlsec-1.5.4.jar and /dev/null differ
diff --git a/tools/aggregator-cli-0.8.0/mda.bat b/tools/aggregator-cli-0.8.0/mda.bat
deleted file mode 100644
index 899db0ea..00000000
--- a/tools/aggregator-cli-0.8.0/mda.bat
+++ /dev/null
@@ -1,49 +0,0 @@
-@echo off
-setlocal
-
-REM We need a JVM
-if not defined JAVA_HOME  (
-  echo Error: JAVA_HOME is not defined.
-  exit /b
-)
-
-if not defined JAVACMD (
-  set JAVACMD="%JAVA_HOME%\bin\java.exe"
-)
-
-if not exist %JAVACMD% (
-  echo Error: JAVA_HOME is not defined correctly.
-  echo Cannot execute %JAVACMD%
-  exit /b
-)
-
-if defined CLASSPATH (
-  set LOCALCLASSPATH=%CLASSPATH%
-)
-
-if not defined MDA_HOME  (
-  echo Error: MDA_HOME is not defined.
-  exit /b
-)
-
-if not exist "%MDA_HOME%" (
-  echo Error: MDA_HOME is not defined correctly.
-  exit /b
-)
-
-REM add in the dependency .jar files
-for %%i in ("%MDA_HOME%\lib\*.jar") do (
-    call "%MDA_HOME%\cpappend.bat" %%i
-)
-
-if exist %JAVA_HOME%\lib\tools.jar (
-    set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\tools.jar
-)
-
-if exist %JAVA_HOME%\lib\classes.zip (
-    set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip
-)
-
-REM Go to it !
-
-%JAVACMD% -classpath "%LOCALCLASSPATH%" -Djava.endorsed.dirs="%MDA_HOME%/lib/endorsed" %JVMOPTS% net.shibboleth.metadata.cli.SimpleCommandLine %*
\ No newline at end of file
diff --git a/tools/aggregator-cli-0.8.0/mda.sh b/tools/aggregator-cli-0.8.0/mda.sh
deleted file mode 100644
index 9828578e..00000000
--- a/tools/aggregator-cli-0.8.0/mda.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/bash
-
-declare LOCATION
-declare COMMAND
-declare JAVACMD
-declare LOCALCLASSPATH
-declare LIBDIR
-
-LOCATION=$0
-LOCATION=${LOCATION%/*}
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "ERROR: JAVA_HOME environment variable is not set."
-  exit
-else
-  if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-    # IBM's JDK on AIX uses strange locations for the executables
-    JAVACMD=$JAVA_HOME/jre/sh/java
-  else
-    JAVACMD=$JAVA_HOME/bin/java
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit
-fi
-
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
-
-# add in the dependency .jar files from the lib directory
-LIBDIR=$LOCATION/lib
-LIBS=$LIBDIR/*.jar
-for i in $LIBS
-do
-    # if the directory is empty, then it will return the input string
-    # this is stupid, so case for it
-    if [ "$i" != "${LIBS}" ] ; then
-        LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
-    fi
-done
-
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" '-Djava.endorsed.dirs='"$LIBDIR/endorsed" $JVMOPTS 'net.shibboleth.metadata.cli.SimpleCommandLine' "$@"
\ No newline at end of file
diff --git a/tools/aggregator-cli-0.8.0/lib/endorsed/serializer-2.11.0.jar b/tools/endorsed/serializer-2.11.0.jar
similarity index 100%
rename from tools/aggregator-cli-0.8.0/lib/endorsed/serializer-2.11.0.jar
rename to tools/endorsed/serializer-2.11.0.jar
diff --git a/tools/aggregator-cli-0.8.0/lib/endorsed/xalan-2.7.1.jar b/tools/endorsed/xalan-2.7.1.jar
similarity index 100%
rename from tools/aggregator-cli-0.8.0/lib/endorsed/xalan-2.7.1.jar
rename to tools/endorsed/xalan-2.7.1.jar
diff --git a/tools/aggregator-cli-0.8.0/lib/endorsed/xercesImpl-2.11.0.jar b/tools/endorsed/xercesImpl-2.11.0.jar
similarity index 100%
rename from tools/aggregator-cli-0.8.0/lib/endorsed/xercesImpl-2.11.0.jar
rename to tools/endorsed/xercesImpl-2.11.0.jar
diff --git a/tools/aggregator-cli-0.8.0/lib/endorsed/xml-apis-2.11.0.jar b/tools/endorsed/xml-apis-2.11.0.jar
similarity index 100%
rename from tools/aggregator-cli-0.8.0/lib/endorsed/xml-apis-2.11.0.jar
rename to tools/endorsed/xml-apis-2.11.0.jar
diff --git a/tools/aggregator-cli-0.8.0/lib/endorsed/xml-resolver-1.2.jar b/tools/endorsed/xml-resolver-1.2.jar
similarity index 100%
rename from tools/aggregator-cli-0.8.0/lib/endorsed/xml-resolver-1.2.jar
rename to tools/endorsed/xml-resolver-1.2.jar