diff --git a/.gitignore b/.gitignore
index ac81b46..87faa55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,7 @@ results/*
 tmp/
 
 # R
-.Rhistory
\ No newline at end of file
+.Rhistory
+
+# Old JARs
+lib2
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 9316117..ce8b075 100644
--- a/build.xml
+++ b/build.xml
@@ -15,10 +15,8 @@
     <property name="jarfile" value="${dist.dir}/Middleware-${DSTAMP}.jar"/>
 
     <!-- Set classpaths -->
-    <path id="test-classpath">
+    <path id="my-classpath">
         <fileset dir="${lib.dir}">
-            <include name="junit-4.12.jar"/>
-            <include name="hamcrest-core-1.3.jar"/>
             <include name="log4j-core-2.6.2.jar"/>
             <include name="log4j-api-2.6.2.jar"/>
         </fileset>
@@ -37,7 +35,8 @@
             description="compile the source">
         <!-- Compile the java code from ${src} into ${build} -->
         <javac srcdir="${src.dir}" destdir="${build.dir}" target="1.7" source="1.7">
-            <classpath refid="test-classpath"/>
+            <classpath refid="my-classpath"/>
+            <exclude name="test/**/"/>
         </javac>
     </target>
 
@@ -51,7 +50,7 @@
 
         <!-- Manifest classpath -->
         <manifestclasspath property="manifest.classpath" jarfile="${jarfile}">
-            <classpath refid="test-classpath"/>
+            <classpath refid="my-classpath"/>
         </manifestclasspath>
 
         <!-- Put everything in ${build} into the JAR file -->
@@ -81,7 +80,7 @@
 
         <!-- Manifest classpath -->
         <manifestclasspath property="manifest.classpath" jarfile="${jarfile}">
-            <classpath refid="test-classpath"/>
+            <classpath refid="my-classpath"/>
         </manifestclasspath>
 
         <!-- Put everything in ${build} into the jar file -->
@@ -94,24 +93,6 @@
         </jar>
     </target>
 
-
-    <target name="test" depends="dist">
-        <junit>
-            <classpath>
-                <pathelement location="${build.dir}" />
-                <fileset dir="${lib.dir}">
-                    <include name="*.jar" />
-                </fileset>
-            </classpath>
-            <batchtest>
-                <fileset dir="${build.dir}">
-                    <include name="**/*Test*" />
-                </fileset>
-            </batchtest>
-            <formatter type="brief" usefile="false"/>
-        </junit>
-    </target>
-
     <target name="clean"
             description="clean up">
         <!-- Delete the ${build} and ${dist} directory trees -->
diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16..0000000
Binary files a/lib/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar
deleted file mode 100644
index 3a7fc26..0000000
Binary files a/lib/junit-4.12.jar and /dev/null differ