diff --git a/api/src/main/java/org/apache/commons/chain2/ChainExecutor.java b/api/src/main/java/org/apache/commons/chain2/ChainExecutor.java
index bef9a83..401f0fb 100644
--- a/api/src/main/java/org/apache/commons/chain2/ChainExecutor.java
+++ b/api/src/main/java/org/apache/commons/chain2/ChainExecutor.java
@@ -18,8 +18,6 @@
 
 import java.util.Map;
 
-import org.apache.commons.chain2.Processing;
-
 /**
  * Builder that allows continue adding a command in the target chain and execute it.
  *
diff --git a/api/src/main/java/org/apache/commons/chain2/Command.java b/api/src/main/java/org/apache/commons/chain2/Command.java
index 2932b86..677c014 100644
--- a/api/src/main/java/org/apache/commons/chain2/Command.java
+++ b/api/src/main/java/org/apache/commons/chain2/Command.java
@@ -18,8 +18,6 @@
 
 import java.util.Map;
 
-import org.apache.commons.chain2.Processing;
-
 /**
  * <p>A {@link Command} encapsulates a unit of processing work to be
  * performed, whose purpose is to examine and/or modify the state of a
diff --git a/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java b/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java
index 8fcf582..0db7f9f 100644
--- a/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java
+++ b/apps/example2/src/main/java/org/apache/commons/chain2/apps/example/CountCommand.java
@@ -17,7 +17,6 @@
 package org.apache.commons.chain2.apps.example;
 
 import org.apache.commons.chain2.Command;
-import org.apache.commons.chain2.Context;
 import org.apache.commons.chain2.Processing;
 import org.apache.commons.chain2.web.WebContext;
 import org.apache.commons.logging.Log;
diff --git a/base/src/main/java/org/apache/commons/chain2/base/OverrideCommand.java b/base/src/main/java/org/apache/commons/chain2/base/OverrideCommand.java
index dfa0b09..794cb9d 100644
--- a/base/src/main/java/org/apache/commons/chain2/base/OverrideCommand.java
+++ b/base/src/main/java/org/apache/commons/chain2/base/OverrideCommand.java
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import org.apache.commons.chain2.Command;
-import org.apache.commons.chain2.Context;
 import org.apache.commons.chain2.Processing;
 
 /**
diff --git a/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTestCase.java b/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTestCase.java
index 56533df..164d65a 100644
--- a/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTestCase.java
+++ b/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTestCase.java
@@ -20,7 +20,6 @@
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 
 import java.util.Collections;
diff --git a/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java b/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java
index 7532b19..67a5edf 100644
--- a/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java
+++ b/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java
@@ -19,7 +19,6 @@
 import static org.apache.commons.chain2.testutils.HasLog.hasLog;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import org.apache.commons.chain2.Catalog;
diff --git a/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java b/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java
index bcf8970..776079b 100644
--- a/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java
+++ b/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java
@@ -18,10 +18,7 @@
 
 import static org.apache.commons.chain2.testutils.HasLog.hasLog;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import org.apache.commons.chain2.Catalog;
diff --git a/base/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java b/base/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java
index 5341bb1..0095682 100644
--- a/base/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java
+++ b/base/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
diff --git a/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTestCase.java b/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTestCase.java
index 216f02e..ad1e5df 100644
--- a/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTestCase.java
+++ b/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasCommandCountTestCase.java
@@ -17,12 +17,9 @@
 
 package org.apache.commons.chain2.testutils;
 
-import static org.apache.commons.chain2.testutils.HasCommandCount.hasCommandCount;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Map;
-
 import org.apache.commons.chain2.Catalog;
 import org.apache.commons.chain2.Context;
 import org.hamcrest.StringDescription;
diff --git a/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTestCase.java b/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTestCase.java
index b3ac9ae..1950348 100644
--- a/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTestCase.java
+++ b/test-utils/src/test/java/org/apache/commons/chain2/testutils/HasLogTestCase.java
@@ -17,14 +17,9 @@
 
 package org.apache.commons.chain2.testutils;
 
-import static org.apache.commons.chain2.testutils.HasLog.hasLog;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import org.apache.commons.chain2.Context;
-import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestContext.java b/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestContext.java
index e2f7fd6..4770532 100644
--- a/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestContext.java
+++ b/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestContext.java
@@ -1,8 +1,6 @@
 package org.apache.commons.chain2.testutils;
 
 import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.commons.chain2.Context;
 
 /**