diff --git a/build/build.xml b/build/build.xml
index d5193d28e..1c0fd5e67 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Spark" default="jar" basedir=".">
 
+
     <!-- Optional add this file to override any of the properties below -->
     <property file="${basedir}/build.properties"/>
     <property name="version.major" value="2"/>
@@ -48,6 +49,18 @@
     <property name="mac.app.file" value="${mac.build.dir}/Spark.app"/>
     <property name="mac.dmg.file" value="${target}/spark_${version.underscore}.dmg"/>
 
+    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+        <classpath>
+            <pathelement location="${lib.dir}/ant-contrib.jar"/>
+        </classpath>
+    </taskdef>
+
+    <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task">
+        <classpath>
+            <pathelement location="${lib.dir}/pack200task.jar"/>
+        </classpath>
+    </taskdef>
+
     <!-- Define Default Library Archives -->
     <path id="agent.dependencies">
         <fileset dir="${dist.libs.dir}" includes="*.jar"/>
@@ -185,6 +198,35 @@
         <!--Put everything in ${classes} into the MyProject-${DSTAMP}.jar file-->
         <tstamp/>
         <jar jarfile="${targetlib}/spark.jar" basedir="${classes}"/>
+        <!--
+         <for param="jar">
+            <path>
+                <fileset dir="${targetlib}" includes="*.jar" />
+            </path>
+            <sequential>
+                <delete file="@{jar}.pack" />
+                <pack200 src="@{jar}"
+                    destfile="@{jar}.pack"
+                    gzipoutput="false"
+                />
+                <delete file="@{jar}" />
+            </sequential>
+        </for>
+
+         <for param="jar">
+            <path>
+                <fileset dir="${commercial.plugin.dir}" includes="*.jar" />
+            </path>
+            <sequential>
+                <delete file="@{jar}.pack" />
+                <pack200 src="@{jar}"
+                    destfile="@{jar}.pack"
+                    gzipoutput="false"
+                />
+                <delete file="@{jar}" />
+            </sequential>
+        </for>
+        -->
     </target>
 
     <!-- javadocs =================================================================================== -->
diff --git a/build/lib/merge/swingx.jar b/build/lib/merge/swingx.jar
deleted file mode 100644
index 48c637d65..000000000
Binary files a/build/lib/merge/swingx.jar and /dev/null differ
diff --git a/build/projects/Spark.iml b/build/projects/Spark.iml
index ba19b3712..3556030db 100644
--- a/build/projects/Spark.iml
+++ b/build/projects/Spark.iml
@@ -81,15 +81,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/merge/backport-util-concurrent.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
@@ -99,15 +90,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/merge/swingx.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
@@ -117,15 +99,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/merge/jtoaster-1.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
diff --git a/src/java/org/jivesoftware/spark/component/JiveSortableTable.java b/src/java/org/jivesoftware/spark/component/JiveSortableTable.java
index d1d9da0a4..213201522 100644
--- a/src/java/org/jivesoftware/spark/component/JiveSortableTable.java
+++ b/src/java/org/jivesoftware/spark/component/JiveSortableTable.java
@@ -10,7 +10,6 @@
 
 package org.jivesoftware.spark.component;
 
-import org.jdesktop.swingx.JXTable;
 import org.jivesoftware.spark.util.GraphicUtils;
 
 import javax.swing.BorderFactory;