diff --git a/src/main/java/org/mbassy/MBassador.java b/src/main/java/org/mbassy/MBassador.java
index c021d6f..c0f3396 100644
--- a/src/main/java/org/mbassy/MBassador.java
+++ b/src/main/java/org/mbassy/MBassador.java
@@ -1,9 +1,9 @@
 package org.mbassy;
 
-import org.mbassy.subscription.*;
+import java.util.Collection;
 
-import java.util.*;
-import java.util.concurrent.*;
+import org.mbassy.subscription.Subscription;
+import org.mbassy.subscription.SubscriptionDeliveryRequest;
 
 
 public class MBassador<T> extends AbstractMessageBus<T, SyncAsyncPostCommand<T>>{
diff --git a/src/main/java/org/mbassy/common/ConcurrentSet.java b/src/main/java/org/mbassy/common/ConcurrentSet.java
index 84c90a6..1e16449 100644
--- a/src/main/java/org/mbassy/common/ConcurrentSet.java
+++ b/src/main/java/org/mbassy/common/ConcurrentSet.java
@@ -3,7 +3,6 @@ package org.mbassy.common;
 
 import java.lang.ref.WeakReference;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.WeakHashMap;
 
 /**
diff --git a/src/main/java/org/mbassy/common/ReflectionUtils.java b/src/main/java/org/mbassy/common/ReflectionUtils.java
index f68c5e0..c855710 100644
--- a/src/main/java/org/mbassy/common/ReflectionUtils.java
+++ b/src/main/java/org/mbassy/common/ReflectionUtils.java
@@ -1,7 +1,6 @@
 package org.mbassy.common;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/main/java/org/mbassy/dispatch/AsynchronousHandlerInvocation.java b/src/main/java/org/mbassy/dispatch/AsynchronousHandlerInvocation.java
index fdbe5e7..90f1b88 100644
--- a/src/main/java/org/mbassy/dispatch/AsynchronousHandlerInvocation.java
+++ b/src/main/java/org/mbassy/dispatch/AsynchronousHandlerInvocation.java
@@ -1,11 +1,6 @@
 package org.mbassy.dispatch;
 
-import org.mbassy.IPublicationErrorHandler;
-import org.mbassy.PublicationError;
-
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Collection;
 
 /**
  * This invocation will schedule the wrapped (decorated) invocation to be executed asynchronously
diff --git a/src/main/java/org/mbassy/dispatch/IMessageDispatcher.java b/src/main/java/org/mbassy/dispatch/IMessageDispatcher.java
index 132eb05..b8309af 100644
--- a/src/main/java/org/mbassy/dispatch/IMessageDispatcher.java
+++ b/src/main/java/org/mbassy/dispatch/IMessageDispatcher.java
@@ -1,7 +1,6 @@
 package org.mbassy.dispatch;
 
 import org.mbassy.common.ConcurrentSet;
-import org.mbassy.subscription.Subscription;
 
 /**
  * A message dispatcher provides the functionality to deliver a single message
diff --git a/src/main/java/org/mbassy/dispatch/MessageDispatcher.java b/src/main/java/org/mbassy/dispatch/MessageDispatcher.java
index c9f133f..1124c9c 100644
--- a/src/main/java/org/mbassy/dispatch/MessageDispatcher.java
+++ b/src/main/java/org/mbassy/dispatch/MessageDispatcher.java
@@ -1,10 +1,9 @@
 package org.mbassy.dispatch;
 
-import org.mbassy.common.ConcurrentSet;
-import org.mbassy.subscription.Subscription;
-
 import java.lang.reflect.Method;
 
+import org.mbassy.common.ConcurrentSet;
+
 /**
  * Standard implementation for direct, unfiltered message delivery.
  *
diff --git a/src/main/java/org/mbassy/subscription/Subscription.java b/src/main/java/org/mbassy/subscription/Subscription.java
index f744701..84cd52a 100644
--- a/src/main/java/org/mbassy/subscription/Subscription.java
+++ b/src/main/java/org/mbassy/subscription/Subscription.java
@@ -1,20 +1,12 @@
 package org.mbassy.subscription;
 
-import org.mbassy.IMessageBus;
-import org.mbassy.IPublicationErrorHandler;
-import org.mbassy.common.ConcurrentSet;
-import org.mbassy.PublicationError;
-import org.mbassy.dispatch.IMessageDispatcher;
-import org.mbassy.dispatch.MessagingContext;
-import org.mbassy.listener.MessageHandlerMetadata;
-
-import javax.xml.ws.handler.MessageContext;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.UUID;
 
+import org.mbassy.common.ConcurrentSet;
+import org.mbassy.dispatch.IMessageDispatcher;
+import org.mbassy.dispatch.MessagingContext;
+
 /**
  * A subscription is a thread safe container for objects that contain message handlers
  */
diff --git a/src/main/java/org/mbassy/subscription/SubscriptionDeliveryRequest.java b/src/main/java/org/mbassy/subscription/SubscriptionDeliveryRequest.java
index 2c58ad4..6c93588 100644
--- a/src/main/java/org/mbassy/subscription/SubscriptionDeliveryRequest.java
+++ b/src/main/java/org/mbassy/subscription/SubscriptionDeliveryRequest.java
@@ -1,7 +1,6 @@
 package org.mbassy.subscription;
 
 import java.util.Collection;
-import java.util.LinkedList;
 
 /**
  * @author bennidi
diff --git a/src/main/java/org/mbassy/subscription/SubscriptionFactory.java b/src/main/java/org/mbassy/subscription/SubscriptionFactory.java
index cfdf00d..b0f1514 100644
--- a/src/main/java/org/mbassy/subscription/SubscriptionFactory.java
+++ b/src/main/java/org/mbassy/subscription/SubscriptionFactory.java
@@ -1,11 +1,13 @@
 package org.mbassy.subscription;
 
-import org.mbassy.IMessageBus;
-import org.mbassy.IPublicationErrorHandler;
-import org.mbassy.dispatch.*;
-import org.mbassy.listener.MessageHandlerMetadata;
-
-import java.util.Collection;
+import org.mbassy.dispatch.AsynchronousHandlerInvocation;
+import org.mbassy.dispatch.EnvelopedMessageDispatcher;
+import org.mbassy.dispatch.FilteredMessageDispatcher;
+import org.mbassy.dispatch.IHandlerInvocation;
+import org.mbassy.dispatch.IMessageDispatcher;
+import org.mbassy.dispatch.MessageDispatcher;
+import org.mbassy.dispatch.MessagingContext;
+import org.mbassy.dispatch.ReflectiveHandlerInvocation;
 
 /**
  * Created with IntelliJ IDEA.
diff --git a/src/test/java/org/mbassy/FilterTest.java b/src/test/java/org/mbassy/FilterTest.java
index cafa354..86e3e42 100644
--- a/src/test/java/org/mbassy/FilterTest.java
+++ b/src/test/java/org/mbassy/FilterTest.java
@@ -1,15 +1,15 @@
 package org.mbassy;
 
+import java.util.List;
+
 import org.junit.Test;
 import org.mbassy.events.SubTestEvent;
 import org.mbassy.events.TestEvent;
 import org.mbassy.listener.Filter;
 import org.mbassy.listener.Filters;
-import org.mbassy.listener.IMessageFilter;
 import org.mbassy.listener.Listener;
-import org.mbassy.listeners.*;
-
-import java.util.List;
+import org.mbassy.listeners.ListenerFactory;
+import org.mbassy.listeners.NonListeningBean;
 
 /**
  * Testing of filter functionality
diff --git a/src/test/java/org/mbassy/MBassadorTest.java b/src/test/java/org/mbassy/MBassadorTest.java
index 5e74760..d15bd3e 100644
--- a/src/test/java/org/mbassy/MBassadorTest.java
+++ b/src/test/java/org/mbassy/MBassadorTest.java
@@ -1,19 +1,22 @@
 package org.mbassy;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.mbassy.events.SubTestEvent;
-import org.mbassy.events.TestEvent;
-import org.mbassy.events.TestEvent2;
-import org.mbassy.listeners.*;
-import org.mbassy.subscription.Subscription;
-
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.junit.Test;
+import org.mbassy.events.SubTestEvent;
+import org.mbassy.events.TestEvent;
+import org.mbassy.events.TestEvent2;
+import org.mbassy.listeners.EventingTestBean;
+import org.mbassy.listeners.EventingTestBean2;
+import org.mbassy.listeners.EventingTestBean3;
+import org.mbassy.listeners.ListenerFactory;
+import org.mbassy.listeners.MultiEventHandler;
+import org.mbassy.listeners.NonListeningBean;
+import org.mbassy.subscription.Subscription;
+
 /**
  * Test synchronous and asynchronous dispatch in single and multi-threaded scenario.
  *
diff --git a/src/test/java/org/mbassy/listeners/MultiEventHandler.java b/src/test/java/org/mbassy/listeners/MultiEventHandler.java
index fd032af..85cd38b 100644
--- a/src/test/java/org/mbassy/listeners/MultiEventHandler.java
+++ b/src/test/java/org/mbassy/listeners/MultiEventHandler.java
@@ -1,9 +1,12 @@
 package org.mbassy.listeners;
 
-import org.mbassy.events.SubTestEvent;
 import org.mbassy.events.TestEvent;
 import org.mbassy.events.TestEvent2;
-import org.mbassy.listener.*;
+import org.mbassy.listener.Enveloped;
+import org.mbassy.listener.Filter;
+import org.mbassy.listener.Filters;
+import org.mbassy.listener.Listener;
+import org.mbassy.listener.Mode;
 import org.mbassy.subscription.MessageEnvelope;
 
 /**
diff --git a/src/test/java/org/mbassy/listeners/NonListeningBean.java b/src/test/java/org/mbassy/listeners/NonListeningBean.java
index 2905590..dd2ecb3 100644
--- a/src/test/java/org/mbassy/listeners/NonListeningBean.java
+++ b/src/test/java/org/mbassy/listeners/NonListeningBean.java
@@ -2,8 +2,6 @@ package org.mbassy.listeners;
 
 import org.mbassy.events.SubTestEvent;
 import org.mbassy.events.TestEvent;
-import org.mbassy.listener.Listener;
-import org.mbassy.listener.Mode;
 
 /**
  * This bean overrides all the handlers defined in its superclass. Since it does not specify any annotations