diff --git a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/Platform.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/Platform.java
index 2d035f390f..84fc97f9df 100644
--- a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/Platform.java
+++ b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/Platform.java
@@ -20,14 +20,10 @@
  */
 
 import java.sql.Connection;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.beanutils.DynaBean;
 import org.jumpmind.symmetric.ddl.model.Database;
 import org.jumpmind.symmetric.ddl.model.Table;
 import org.jumpmind.symmetric.ddl.platform.CreationParameters;
diff --git a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/io/DigesterRules.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/io/DigesterRules.java
index 54dd9fe24d..57f339cdc1 100644
--- a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/io/DigesterRules.java
+++ b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/io/DigesterRules.java
@@ -20,6 +20,7 @@
  */
 
 import java.util.List;
+
 import org.apache.commons.digester.Rule;
 import org.apache.commons.digester.RulesBase;
 
diff --git a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/model/Table.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/model/Table.java
index 87eb65bbe4..920e6bbd19 100644
--- a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/model/Table.java
+++ b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/model/Table.java
@@ -22,14 +22,14 @@
 import java.io.Serializable;
 import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Collection;
 
-import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
diff --git a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/oracle/Oracle8Platform.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/oracle/Oracle8Platform.java
index c787a8b357..4591ffd341 100644
--- a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/oracle/Oracle8Platform.java
+++ b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/oracle/Oracle8Platform.java
@@ -20,6 +20,7 @@
  */
 
 import java.sql.Types;
+import java.util.Map;
 
 import org.jumpmind.symmetric.ddl.PlatformInfo;
 import org.jumpmind.symmetric.ddl.platform.PlatformImplBase;
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/TestPlatformBase.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/TestPlatformBase.java
index d911eb5897..f8516796c1 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/TestPlatformBase.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/TestPlatformBase.java
@@ -23,9 +23,6 @@
 import java.io.IOException;
 import java.io.StringWriter;
 
-import org.jumpmind.symmetric.ddl.Platform;
-import org.jumpmind.symmetric.ddl.PlatformFactory;
-import org.jumpmind.symmetric.ddl.PlatformInfo;
 import org.jumpmind.symmetric.ddl.model.Database;
 import org.jumpmind.symmetric.ddl.platform.SqlBuilder;
 import org.xml.sax.SAXException;
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/alteration/TestModelComparator.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/alteration/TestModelComparator.java
index b206355fe2..05ef36ee07 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/alteration/TestModelComparator.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/alteration/TestModelComparator.java
@@ -24,24 +24,6 @@
 
 import org.jumpmind.symmetric.ddl.PlatformInfo;
 import org.jumpmind.symmetric.ddl.TestBase;
-import org.jumpmind.symmetric.ddl.alteration.AddColumnChange;
-import org.jumpmind.symmetric.ddl.alteration.AddForeignKeyChange;
-import org.jumpmind.symmetric.ddl.alteration.AddIndexChange;
-import org.jumpmind.symmetric.ddl.alteration.AddPrimaryKeyChange;
-import org.jumpmind.symmetric.ddl.alteration.AddTableChange;
-import org.jumpmind.symmetric.ddl.alteration.ColumnAutoIncrementChange;
-import org.jumpmind.symmetric.ddl.alteration.ColumnDataTypeChange;
-import org.jumpmind.symmetric.ddl.alteration.ColumnDefaultValueChange;
-import org.jumpmind.symmetric.ddl.alteration.ColumnOrderChange;
-import org.jumpmind.symmetric.ddl.alteration.ColumnRequiredChange;
-import org.jumpmind.symmetric.ddl.alteration.ColumnSizeChange;
-import org.jumpmind.symmetric.ddl.alteration.ModelComparator;
-import org.jumpmind.symmetric.ddl.alteration.PrimaryKeyChange;
-import org.jumpmind.symmetric.ddl.alteration.RemoveColumnChange;
-import org.jumpmind.symmetric.ddl.alteration.RemoveForeignKeyChange;
-import org.jumpmind.symmetric.ddl.alteration.RemoveIndexChange;
-import org.jumpmind.symmetric.ddl.alteration.RemovePrimaryKeyChange;
-import org.jumpmind.symmetric.ddl.alteration.RemoveTableChange;
 import org.jumpmind.symmetric.ddl.model.Database;
 import org.jumpmind.symmetric.ddl.model.Table;
 
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/TestDatabaseIO.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/TestDatabaseIO.java
index dae31c8b95..a167f2a1f3 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/TestDatabaseIO.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/TestDatabaseIO.java
@@ -29,8 +29,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jumpmind.symmetric.ddl.io.DatabaseIO;
-import org.jumpmind.symmetric.ddl.io.LocalEntityResolver;
 import org.jumpmind.symmetric.ddl.model.Column;
 import org.jumpmind.symmetric.ddl.model.Database;
 import org.jumpmind.symmetric.ddl.model.ForeignKey;
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/converters/TestDateConverter.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/converters/TestDateConverter.java
index 0c5af4e008..59c5ee8e40 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/converters/TestDateConverter.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/converters/TestDateConverter.java
@@ -23,9 +23,6 @@
 import java.sql.Types;
 import java.util.Calendar;
 
-import org.jumpmind.symmetric.ddl.io.converters.ConversionException;
-import org.jumpmind.symmetric.ddl.io.converters.DateConverter;
-
 import junit.framework.TestCase;
 
 /**
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/converters/TestTimeConverter.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/converters/TestTimeConverter.java
index cdff1f5fe7..76a5c2760d 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/converters/TestTimeConverter.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/io/converters/TestTimeConverter.java
@@ -23,9 +23,6 @@
 import java.sql.Types;
 import java.util.Calendar;
 
-import org.jumpmind.symmetric.ddl.io.converters.ConversionException;
-import org.jumpmind.symmetric.ddl.io.converters.TimeConverter;
-
 import junit.framework.TestCase;
 
 /**
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/model/TestArrayAccessAtTable.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/model/TestArrayAccessAtTable.java
index 8250129859..f929310552 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/model/TestArrayAccessAtTable.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/model/TestArrayAccessAtTable.java
@@ -19,12 +19,6 @@
  * under the License.
  */
 
-import org.jumpmind.symmetric.ddl.model.Column;
-import org.jumpmind.symmetric.ddl.model.Index;
-import org.jumpmind.symmetric.ddl.model.NonUniqueIndex;
-import org.jumpmind.symmetric.ddl.model.Table;
-import org.jumpmind.symmetric.ddl.model.UniqueIndex;
-
 import junit.framework.TestCase;
 
 /**
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestMySql50Platform.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestMySql50Platform.java
index cb8c8c64ac..2660e59f80 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestMySql50Platform.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestMySql50Platform.java
@@ -21,7 +21,6 @@
 
 import org.jumpmind.symmetric.ddl.TestPlatformBase;
 import org.jumpmind.symmetric.ddl.model.Database;
-import org.jumpmind.symmetric.ddl.platform.CreationParameters;
 import org.jumpmind.symmetric.ddl.platform.mysql.MySql50Platform;
 
 /**
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestMySqlPlatform.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestMySqlPlatform.java
index e1df9059b0..1c373b1793 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestMySqlPlatform.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestMySqlPlatform.java
@@ -21,7 +21,6 @@
 
 import org.jumpmind.symmetric.ddl.TestPlatformBase;
 import org.jumpmind.symmetric.ddl.model.Database;
-import org.jumpmind.symmetric.ddl.platform.CreationParameters;
 import org.jumpmind.symmetric.ddl.platform.mysql.MySqlPlatform;
 
 /**
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestPlatform.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestPlatform.java
index 2083f50b77..6181a58562 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestPlatform.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestPlatform.java
@@ -1,7 +1,5 @@
 package org.jumpmind.symmetric.ddl.platform;
 
-import org.jumpmind.symmetric.ddl.platform.PlatformImplBase;
-import org.jumpmind.symmetric.ddl.platform.SqlBuilder;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestSqlBuilder.java b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestSqlBuilder.java
index 3a82f215ee..7b10b13646 100644
--- a/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestSqlBuilder.java
+++ b/symmetric/symmetric-ddl/src/test/java/org/jumpmind/symmetric/ddl/platform/TestSqlBuilder.java
@@ -25,7 +25,6 @@
 import org.jumpmind.symmetric.ddl.TestBase;
 import org.jumpmind.symmetric.ddl.model.Database;
 import org.jumpmind.symmetric.ddl.model.Table;
-import org.jumpmind.symmetric.ddl.platform.SqlBuilder;
 
 /**
  * Test the base SqlBuilder class.