From f7a45c0e8f58fbe59e0543cec9e80cc260b79af1 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 15:38:04 +0100
Subject: [PATCH 01/11] Removing dead imports from akka-actor

---
 .../java/akka/dispatch/AbstractMessageDispatcher.java |  1 -
 akka-actor/src/main/scala/akka/actor/Actor.scala      | 11 -----------
 akka-actor/src/main/scala/akka/actor/ActorRef.scala   |  5 +----
 .../src/main/scala/akka/actor/ActorRefProvider.scala  |  3 +--
 .../src/main/scala/akka/actor/ActorSystem.scala       |  2 --
 akka-actor/src/main/scala/akka/actor/Deployer.scala   |  5 -----
 akka-actor/src/main/scala/akka/actor/FSM.scala        |  1 -
 .../src/main/scala/akka/actor/FaultHandling.scala     |  1 -
 akka-actor/src/main/scala/akka/actor/Locker.scala     |  1 -
 akka-actor/src/main/scala/akka/actor/Props.scala      |  1 -
 akka-actor/src/main/scala/akka/actor/Scheduler.scala  |  2 +-
 akka-actor/src/main/scala/akka/actor/TypedActor.scala |  4 ++--
 .../src/main/scala/akka/actor/UntypedActor.scala      |  3 +--
 .../scala/akka/dispatch/BalancingDispatcher.scala     |  6 +-----
 .../src/main/scala/akka/dispatch/Dispatchers.scala    |  3 ---
 akka-actor/src/main/scala/akka/dispatch/Future.scala  | 11 ++++-------
 akka-actor/src/main/scala/akka/dispatch/Mailbox.scala |  1 -
 .../main/scala/akka/dispatch/PinnedDispatcher.scala   |  5 -----
 .../src/main/scala/akka/dispatch/PromiseStream.scala  |  2 +-
 .../main/scala/akka/dispatch/ThreadPoolBuilder.scala  |  2 +-
 .../src/main/scala/akka/dispatch/japi/Future.scala    |  3 +--
 .../main/scala/akka/routing/ConnectionManager.scala   |  5 -----
 akka-actor/src/main/scala/akka/routing/Routing.scala  |  6 ++----
 akka-actor/src/main/scala/akka/util/ByteString.scala  |  6 +++---
 akka-actor/src/main/scala/akka/util/Duration.scala    |  3 +--
 akka-actor/src/main/scala/akka/util/Helpers.scala     |  1 -
 .../src/main/scala/akka/util/ReflectiveAccess.scala   |  1 -
 27 files changed, 20 insertions(+), 75 deletions(-)

diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java b/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java
index 8248fd9e07..6720cf2b54 100644
--- a/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java
+++ b/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java
@@ -6,7 +6,6 @@ package akka.dispatch;
 
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 abstract class AbstractMessageDispatcher {
     private volatile int _shutdownSchedule; // not initialized because this is faster: 0 == UNSCHEDULED
diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 7a1f640160..94aef4bdef 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -4,20 +4,9 @@
 
 package akka.actor
 
-import akka.dispatch._
-import akka.routing._
-import akka.util.Duration
-import akka.japi.{ Creator, Procedure }
-import akka.serialization.{ Serializer, Serialization }
-import akka.event.Logging.Debug
-import akka.event.LogSource
-import akka.experimental
 import akka.AkkaException
 import scala.reflect.BeanProperty
 import scala.util.control.NoStackTrace
-import com.eaio.uuid.UUID
-import java.util.concurrent.TimeUnit
-import java.util.{ Collection ⇒ JCollection }
 import java.util.regex.Pattern
 
 /**
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 5ccce6906c..fa6c9962e7 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -9,13 +9,10 @@ import akka.util._
 import scala.collection.immutable.Stack
 import java.lang.{ UnsupportedOperationException, IllegalStateException }
 import akka.serialization.Serialization
-import java.util.concurrent.TimeUnit
 import akka.event.EventStream
-import akka.event.DeathWatch
 import scala.annotation.tailrec
-import java.util.concurrent.{ ConcurrentHashMap, TimeoutException }
+import java.util.concurrent.{ ConcurrentHashMap }
 import akka.event.LoggingAdapter
-import java.util.concurrent.atomic.AtomicBoolean
 
 /**
  * Immutable and serializable handle to an actor, which may or may not reside
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index 2ac45e90a9..a7e9a2163e 100755
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -5,11 +5,10 @@
 package akka.actor
 
 import java.util.concurrent.atomic.AtomicLong
-import akka.config.ConfigurationException
 import akka.dispatch._
 import akka.routing._
 import akka.AkkaException
-import akka.util.{ Duration, Switch, Helpers, Timeout }
+import akka.util.{ Switch, Helpers }
 import akka.event._
 
 /**
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index c6842d0dc2..fc4a6f1f19 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -7,8 +7,6 @@ import akka.config.ConfigurationException
 import akka.event._
 import akka.dispatch._
 import akka.pattern.ask
-import akka.util.duration._
-import akka.util.Timeout._
 import org.jboss.netty.akka.util.HashedWheelTimer
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import com.typesafe.config.Config
diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala
index a13d3a8424..c8e780d5c2 100644
--- a/akka-actor/src/main/scala/akka/actor/Deployer.scala
+++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala
@@ -4,12 +4,7 @@
 
 package akka.actor
 
-import collection.immutable.Seq
-import akka.event.Logging
-import akka.AkkaException
-import akka.config.ConfigurationException
 import akka.util.Duration
-import akka.event.EventStream
 import com.typesafe.config._
 import akka.routing._
 import java.util.concurrent.{ TimeUnit, ConcurrentHashMap }
diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala
index eb7081899c..5660811c00 100644
--- a/akka-actor/src/main/scala/akka/actor/FSM.scala
+++ b/akka-actor/src/main/scala/akka/actor/FSM.scala
@@ -7,7 +7,6 @@ import akka.util._
 
 import scala.collection.mutable
 import akka.event.Logging
-import akka.util.Duration._
 import akka.routing.{ Deafen, Listen, Listeners }
 
 object FSM {
diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
index 8d26567c37..71102ffb03 100644
--- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
@@ -4,7 +4,6 @@
 package akka.actor
 
 import java.util.concurrent.TimeUnit
-import scala.annotation.tailrec
 import scala.collection.mutable.ArrayBuffer
 import scala.collection.JavaConversions._
 import java.lang.{ Iterable ⇒ JIterable }
diff --git a/akka-actor/src/main/scala/akka/actor/Locker.scala b/akka-actor/src/main/scala/akka/actor/Locker.scala
index 9e34f02332..4f9caaeedc 100644
--- a/akka-actor/src/main/scala/akka/actor/Locker.scala
+++ b/akka-actor/src/main/scala/akka/actor/Locker.scala
@@ -5,7 +5,6 @@ package akka.actor
 
 import akka.dispatch._
 import akka.util.Duration
-import akka.util.duration._
 import java.util.concurrent.ConcurrentHashMap
 import akka.event.DeathWatch
 
diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala
index c0b84d0017..cd9a62abe7 100644
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.scala
@@ -6,7 +6,6 @@ package akka.actor
 
 import akka.dispatch._
 import akka.japi.Creator
-import akka.util._
 import collection.immutable.Stack
 import akka.routing._
 
diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
index a2451173b3..72d429b450 100644
--- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
@@ -13,7 +13,7 @@
 package akka.actor
 
 import akka.util.Duration
-import org.jboss.netty.akka.util.{ Timer, TimerTask, HashedWheelTimer, Timeout ⇒ HWTimeout }
+import org.jboss.netty.akka.util.{ TimerTask, HashedWheelTimer, Timeout ⇒ HWTimeout }
 import akka.event.LoggingAdapter
 import akka.dispatch.MessageDispatcher
 import java.io.Closeable
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index ce487ec2ef..69c8e44fc3 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -6,9 +6,9 @@ package akka.actor
 
 import akka.japi.{ Creator, Option ⇒ JOption }
 import java.lang.reflect.{ InvocationTargetException, Method, InvocationHandler, Proxy }
-import akka.util.{ Duration, Timeout }
+import akka.util.{ Timeout }
 import java.util.concurrent.atomic.{ AtomicReference ⇒ AtomVar }
-import akka.serialization.{ Serializer, Serialization, SerializationExtension }
+import akka.serialization.{ Serialization, SerializationExtension }
 import akka.dispatch._
 import java.util.concurrent.TimeoutException
 import java.lang.IllegalStateException
diff --git a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
index d06896a10d..6dd4d8c2c5 100644
--- a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
@@ -4,8 +4,7 @@
 
 package akka.actor
 
-import akka.japi.{ Creator, Procedure }
-import akka.dispatch.{ MessageDispatcher, Promise }
+import akka.japi.{ Creator }
 
 /**
  * Actor base trait that should be extended by or mixed to create an Actor with the semantics of the 'Actor Model':
diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
index cc2d7a5e96..c4742df81a 100644
--- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
@@ -5,13 +5,9 @@
 package akka.dispatch
 
 import util.DynamicVariable
-import akka.actor.{ ActorCell, Actor, IllegalActorStateException, ActorRef }
+import akka.actor.{ ActorCell, ActorRef }
 import java.util.concurrent.{ LinkedBlockingQueue, ConcurrentLinkedQueue, ConcurrentSkipListSet }
-import java.util.{ Comparator, Queue }
 import annotation.tailrec
-import akka.actor.ActorSystem
-import akka.event.EventStream
-import akka.actor.Scheduler
 import java.util.concurrent.atomic.AtomicBoolean
 import akka.util.Duration
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
index b622c52c74..3871905905 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
@@ -9,12 +9,9 @@ import akka.util.{ Duration, ReflectiveAccess }
 import akka.actor.ActorSystem
 import akka.event.EventStream
 import akka.actor.Scheduler
-import akka.actor.ActorSystem.Settings
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import akka.config.ConfigurationException
 import akka.event.Logging.Warning
-import akka.actor.Props
 import java.util.concurrent.{ ThreadFactory, TimeUnit, ConcurrentHashMap }
 
 trait DispatcherPrerequisites {
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 09ce22d6b8..2663aff23e 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -4,25 +4,22 @@
 
 package akka.dispatch
 
-import akka.AkkaException
 import akka.event.Logging.Error
-import akka.util.Timeout
 import scala.Option
-import akka.japi.{ Procedure, Function ⇒ JFunc, Option ⇒ JOption }
+import akka.japi.{ Function ⇒ JFunc, Option ⇒ JOption }
 
 import scala.util.continuations._
 
-import java.util.concurrent.TimeUnit.{ NANOSECONDS, MILLISECONDS }
+import java.util.concurrent.TimeUnit.{ NANOSECONDS }
 import java.lang.{ Iterable ⇒ JIterable }
 import java.util.{ LinkedList ⇒ JLinkedList }
 
 import scala.annotation.tailrec
 import scala.collection.mutable.Stack
-import akka.util.{ Switch, Duration, BoxedType }
-import java.util.concurrent.atomic.{ AtomicReferenceFieldUpdater, AtomicInteger, AtomicBoolean }
+import akka.util.{ Duration, BoxedType }
+import java.util.concurrent.atomic.{ AtomicReferenceFieldUpdater, AtomicInteger }
 import akka.dispatch.Await.CanAwait
 import java.util.concurrent._
-import akka.actor.ActorSystem
 
 object Await {
   sealed trait CanAwait
diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
index 40d4650f0d..d2bc7ff01d 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
@@ -10,7 +10,6 @@ import akka.actor.{ ActorCell, ActorRef }
 import java.util.concurrent._
 import annotation.tailrec
 import akka.event.Logging.Error
-import com.typesafe.config.Config
 import akka.actor.ActorContext
 
 class MessageQueueAppendFailedException(message: String, cause: Throwable = null) extends AkkaException(message, cause)
diff --git a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
index c88113fc64..246b1f591a 100644
--- a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
@@ -4,13 +4,8 @@
 
 package akka.dispatch
 
-import java.util.concurrent.atomic.AtomicReference
 import akka.actor.ActorCell
-import akka.actor.ActorSystem
-import akka.event.EventStream
-import akka.actor.Scheduler
 import akka.util.Duration
-import java.util.concurrent.TimeUnit
 
 /**
  * Dedicates a unique thread for each actor passed in as reference. Served through its messageQueue.
diff --git a/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala b/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala
index b6305701b2..b1c25f55e1 100644
--- a/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala
@@ -6,7 +6,7 @@ package akka.dispatch
 
 import java.util.concurrent.atomic.AtomicReference
 import scala.util.continuations._
-import scala.annotation.{ tailrec }
+import scala.annotation.tailrec
 import akka.util.Timeout
 
 object PromiseStream {
diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
index 9601c4dd5e..f8927f667a 100644
--- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
@@ -5,7 +5,7 @@
 package akka.dispatch
 
 import java.util.Collection
-import java.util.concurrent.atomic.{ AtomicLong, AtomicInteger }
+import java.util.concurrent.atomic.AtomicLong
 import akka.util.Duration
 import java.util.concurrent._
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/japi/Future.scala b/akka-actor/src/main/scala/akka/dispatch/japi/Future.scala
index ac4ef7694e..a237c0c647 100644
--- a/akka-actor/src/main/scala/akka/dispatch/japi/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/japi/Future.scala
@@ -3,8 +3,7 @@
  */
 package akka.dispatch.japi
 
-import akka.util.Timeout
-import akka.japi.{ Procedure2, Procedure, Function ⇒ JFunc, Option ⇒ JOption }
+import akka.japi.{ Procedure2, Procedure, Function ⇒ JFunc }
 
 /* Java API */
 trait Future[+T] { self: akka.dispatch.Future[T] ⇒
diff --git a/akka-actor/src/main/scala/akka/routing/ConnectionManager.scala b/akka-actor/src/main/scala/akka/routing/ConnectionManager.scala
index 3ce73f5020..94ceffb91f 100644
--- a/akka-actor/src/main/scala/akka/routing/ConnectionManager.scala
+++ b/akka-actor/src/main/scala/akka/routing/ConnectionManager.scala
@@ -6,11 +6,6 @@ package akka.routing
 
 import akka.actor._
 
-import scala.annotation.tailrec
-
-import java.util.concurrent.atomic.{ AtomicReference, AtomicInteger }
-import collection.JavaConverters
-
 /**
  * An Iterable that also contains a version.
  */
diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
index c6fb245d6a..4ef7cff330 100644
--- a/akka-actor/src/main/scala/akka/routing/Routing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Routing.scala
@@ -4,11 +4,9 @@
 package akka.routing
 
 import akka.actor._
-import akka.dispatch.{ Future, Promise }
-import java.util.concurrent.atomic.AtomicLong
-import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.{ AtomicLong, AtomicBoolean }
 import java.util.concurrent.TimeUnit
-import akka.util.{ Duration, Timeout }
+import akka.util.Duration
 import akka.util.duration._
 import com.typesafe.config.Config
 import akka.config.ConfigurationException
diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala
index 125b605a89..dd38fe3bdd 100644
--- a/akka-actor/src/main/scala/akka/util/ByteString.scala
+++ b/akka-actor/src/main/scala/akka/util/ByteString.scala
@@ -3,10 +3,10 @@ package akka.util
 import java.nio.ByteBuffer
 import java.nio.charset.Charset
 
-import scala.collection.{ IndexedSeqOptimized, LinearSeq }
-import scala.collection.mutable.{ Builder, ArrayBuilder, WrappedArray }
+import scala.collection.{ IndexedSeqOptimized }
+import scala.collection.mutable.{ Builder, WrappedArray }
 import scala.collection.immutable.{ IndexedSeq, VectorBuilder }
-import scala.collection.generic.{ CanBuildFrom, GenericCompanion }
+import scala.collection.generic.{ CanBuildFrom }
 
 object ByteString {
 
diff --git a/akka-actor/src/main/scala/akka/util/Duration.scala b/akka-actor/src/main/scala/akka/util/Duration.scala
index 00dc1ae7e1..65d6e6148c 100644
--- a/akka-actor/src/main/scala/akka/util/Duration.scala
+++ b/akka-actor/src/main/scala/akka/util/Duration.scala
@@ -6,8 +6,7 @@ package akka.util
 
 import java.util.concurrent.TimeUnit
 import TimeUnit._
-import java.lang.{ Long ⇒ JLong, Double ⇒ JDouble }
-import akka.actor.ActorSystem
+import java.lang.{ Double ⇒ JDouble }
 
 class TimerException(message: String) extends RuntimeException(message)
 
diff --git a/akka-actor/src/main/scala/akka/util/Helpers.scala b/akka-actor/src/main/scala/akka/util/Helpers.scala
index d98e0a49f1..60e6be8b65 100644
--- a/akka-actor/src/main/scala/akka/util/Helpers.scala
+++ b/akka-actor/src/main/scala/akka/util/Helpers.scala
@@ -3,7 +3,6 @@
  */
 package akka.util
 
-import java.io.{ PrintWriter, StringWriter }
 import java.util.Comparator
 import scala.annotation.tailrec
 import java.util.regex.Pattern
diff --git a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
index 18ed6a5020..7c00d69225 100644
--- a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
+++ b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
@@ -4,7 +4,6 @@
 
 package akka.util
 
-import akka.actor._
 import java.lang.reflect.InvocationTargetException
 
 object ReflectiveAccess {

From a2c558838d65f26d6a99707cc57dbba68570905d Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 15:42:29 +0100
Subject: [PATCH 02/11] Removing dead imports in akka-migration

---
 .../src/main/scala/akka/actor/GlobalActorSystem.scala           | 1 -
 akka-actor-migration/src/main/scala/akka/actor/OldActor.scala   | 1 -
 .../src/main/scala/akka/dispatch/OldFuture.scala                | 1 -
 .../src/main/scala/akka/migration/package.scala                 | 2 +-
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala b/akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala
index e0ba90b1f9..694dd5d547 100644
--- a/akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala
+++ b/akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala
@@ -8,7 +8,6 @@ import java.io.File
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigParseOptions
-import com.typesafe.config.ConfigResolveOptions
 
 @deprecated("use ActorSystem instead", "2.0")
 object GlobalActorSystem extends ActorSystemImpl("GlobalSystem", OldConfigurationLoader.defaultConfig) {
diff --git a/akka-actor-migration/src/main/scala/akka/actor/OldActor.scala b/akka-actor-migration/src/main/scala/akka/actor/OldActor.scala
index e923773bd8..49035093dd 100644
--- a/akka-actor-migration/src/main/scala/akka/actor/OldActor.scala
+++ b/akka-actor-migration/src/main/scala/akka/actor/OldActor.scala
@@ -9,7 +9,6 @@ import akka.dispatch.Future
 import akka.dispatch.OldFuture
 import akka.util.Duration
 import java.util.concurrent.TimeUnit
-import java.net.InetSocketAddress
 import akka.migration.AskableActorRef
 
 /**
diff --git a/akka-actor-migration/src/main/scala/akka/dispatch/OldFuture.scala b/akka-actor-migration/src/main/scala/akka/dispatch/OldFuture.scala
index f53a3dd11b..89941cd066 100644
--- a/akka-actor-migration/src/main/scala/akka/dispatch/OldFuture.scala
+++ b/akka-actor-migration/src/main/scala/akka/dispatch/OldFuture.scala
@@ -4,7 +4,6 @@
 package akka.dispatch
 
 import java.util.concurrent.TimeoutException
-import akka.util.duration._
 import akka.AkkaException
 import akka.util.BoxedType
 import akka.util.Duration
diff --git a/akka-actor-migration/src/main/scala/akka/migration/package.scala b/akka-actor-migration/src/main/scala/akka/migration/package.scala
index 4fd8d5eeea..6b8cad6fe2 100644
--- a/akka-actor-migration/src/main/scala/akka/migration/package.scala
+++ b/akka-actor-migration/src/main/scala/akka/migration/package.scala
@@ -21,7 +21,7 @@ package object migration {
   implicit def actorRef2OldActorRef(actorRef: ActorRef) = new OldActorRef(actorRef)
 
   class OldActorRef(actorRef: ActorRef) {
-    @deprecated("Actors are automatically started when creatd, i.e. remove old call to start()", "2.0")
+    @deprecated("Actors are automatically started when created, i.e. remove old call to start()", "2.0")
     def start(): ActorRef = actorRef
 
     @deprecated("Stop with ActorSystem or ActorContext instead", "2.0")

From 08967d414906291f580cc6b961eee12eefc2d71a Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 15:46:45 +0100
Subject: [PATCH 03/11] Removing dead imports in durable mailboxes

---
 .../akka/actor/mailbox/BeanstalkBasedMailbox.scala     |  2 --
 .../main/scala/akka/actor/mailbox/DurableMailbox.scala | 10 +++-------
 .../scala/akka/actor/mailbox/BSONSerialization.scala   |  3 +--
 .../scala/akka/actor/mailbox/MongoBasedMailbox.scala   |  2 +-
 .../akka/actor/mailbox/ZooKeeperBasedMailbox.scala     |  3 ---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/akka-durable-mailboxes/akka-beanstalk-mailbox/src/main/scala/akka/actor/mailbox/BeanstalkBasedMailbox.scala b/akka-durable-mailboxes/akka-beanstalk-mailbox/src/main/scala/akka/actor/mailbox/BeanstalkBasedMailbox.scala
index 6715679eb5..cd2ca2d0f0 100644
--- a/akka-durable-mailboxes/akka-beanstalk-mailbox/src/main/scala/akka/actor/mailbox/BeanstalkBasedMailbox.scala
+++ b/akka-durable-mailboxes/akka-beanstalk-mailbox/src/main/scala/akka/actor/mailbox/BeanstalkBasedMailbox.scala
@@ -5,8 +5,6 @@ package akka.actor.mailbox
 
 import com.surftools.BeanstalkClient._
 import com.surftools.BeanstalkClientImpl._
-import java.util.concurrent.TimeUnit.MILLISECONDS
-import akka.util.Duration
 import akka.AkkaException
 import akka.actor.ActorContext
 import akka.dispatch.Envelope
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala b/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala
index 7156a859c1..e00520d92c 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala
@@ -3,14 +3,10 @@
  */
 package akka.actor.mailbox
 
-import akka.actor.ActorContext
-import akka.actor.ActorRef
-import akka.dispatch.Envelope
-import akka.dispatch.DefaultSystemMessageQueue
-import akka.dispatch.CustomMailbox
+import akka.actor.{ ActorContext, ActorRef }
+import akka.dispatch.{ Envelope, DefaultSystemMessageQueue, CustomMailbox }
 import akka.remote.MessageSerializer
-import akka.remote.RemoteProtocol.ActorRefProtocol
-import akka.remote.RemoteProtocol.RemoteMessageProtocol
+import akka.remote.RemoteProtocol.{ ActorRefProtocol, RemoteMessageProtocol }
 
 private[akka] object DurableExecutableMailboxConfig {
   val Name = "[\\.\\/\\$\\s]".r
diff --git a/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/BSONSerialization.scala b/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/BSONSerialization.scala
index 7da9dd7a3e..470993fdf3 100644
--- a/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/BSONSerialization.scala
+++ b/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/BSONSerialization.scala
@@ -14,10 +14,9 @@ import org.bson.BSONSerializer
 import org.bson.DefaultBSONDeserializer
 import org.bson.DefaultBSONSerializer
 
-import akka.actor.SerializedActorRef
 import akka.remote.RemoteProtocol.MessageProtocol
 import akka.remote.MessageSerializer
-import akka.actor.{ ActorSystem, ActorSystemImpl, Props }
+import akka.actor.{ ActorSystem, ActorSystemImpl }
 
 class BSONSerializableMailbox(system: ActorSystem) extends SerializableBSONObject[MongoDurableMessage] with Logging {
 
diff --git a/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/MongoBasedMailbox.scala b/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/MongoBasedMailbox.scala
index 4eb36eefe1..fed643c7d1 100644
--- a/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/MongoBasedMailbox.scala
+++ b/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/MongoBasedMailbox.scala
@@ -10,7 +10,7 @@ import org.bson.collection._
 import akka.actor.ActorContext
 import akka.event.Logging
 import akka.actor.ActorRef
-import akka.dispatch.{ Await, Promise, Envelope, DefaultPromise }
+import akka.dispatch.{ Await, Promise, Envelope }
 import java.util.concurrent.TimeoutException
 import akka.dispatch.MailboxType
 import com.typesafe.config.Config
diff --git a/akka-durable-mailboxes/akka-zookeeper-mailbox/src/main/scala/akka/actor/mailbox/ZooKeeperBasedMailbox.scala b/akka-durable-mailboxes/akka-zookeeper-mailbox/src/main/scala/akka/actor/mailbox/ZooKeeperBasedMailbox.scala
index 4ac254cdc1..1420a8a543 100644
--- a/akka-durable-mailboxes/akka-zookeeper-mailbox/src/main/scala/akka/actor/mailbox/ZooKeeperBasedMailbox.scala
+++ b/akka-durable-mailboxes/akka-zookeeper-mailbox/src/main/scala/akka/actor/mailbox/ZooKeeperBasedMailbox.scala
@@ -3,10 +3,7 @@
  */
 package akka.actor.mailbox
 
-import java.util.concurrent.TimeUnit.MILLISECONDS
-import akka.util.Duration
 import akka.AkkaException
-import org.I0Itec.zkclient.serialize._
 import akka.actor.ActorContext
 import akka.cluster.zookeeper.AkkaZkClient
 import akka.dispatch.Envelope

From 7f0c4e3d63024030f49b4903a7e0d0671cc64be2 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 15:48:30 +0100
Subject: [PATCH 04/11] Removing dead imports from kernel

---
 akka-kernel/src/main/scala/akka/kernel/Main.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-kernel/src/main/scala/akka/kernel/Main.scala b/akka-kernel/src/main/scala/akka/kernel/Main.scala
index 3b89cf4ec0..ead2c28121 100644
--- a/akka-kernel/src/main/scala/akka/kernel/Main.scala
+++ b/akka-kernel/src/main/scala/akka/kernel/Main.scala
@@ -7,7 +7,7 @@ package akka.kernel
 import akka.actor.ActorSystem
 import java.io.File
 import java.lang.Boolean.getBoolean
-import java.net.{ URL, URLClassLoader }
+import java.net.URLClassLoader
 import java.util.jar.JarFile
 import scala.collection.JavaConverters._
 

From 1590438b0c1ff38f8af09577817fd33cbaf20fe7 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 15:55:27 +0100
Subject: [PATCH 05/11] Removing dead imports from akka-remote

---
 .../main/scala/akka/remote/AccrualFailureDetector.scala    | 2 --
 akka-remote/src/main/scala/akka/remote/Gossiper.scala      | 2 --
 .../src/main/scala/akka/remote/NetworkEventStream.scala    | 4 +---
 akka-remote/src/main/scala/akka/remote/Remote.scala        | 4 +---
 .../main/scala/akka/remote/RemoteActorRefProvider.scala    | 7 -------
 .../main/scala/akka/remote/RemoteConnectionManager.scala   | 1 -
 .../src/main/scala/akka/remote/RemoteInterface.scala       | 3 ---
 .../src/main/scala/akka/remote/RemoteSettings.scala        | 1 -
 .../main/scala/akka/remote/netty/NettyRemoteSupport.scala  | 3 +--
 .../akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala  | 3 ---
 .../scala/akka/remote/NewRemoteActorMultiJvmSpec.scala     | 4 ----
 .../akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala  | 2 --
 .../remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala   | 2 --
 .../ScatterGatherRoutedRemoteActorMultiJvmSpec.scala       | 1 -
 14 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/AccrualFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/AccrualFailureDetector.scala
index 0e653819ee..af74c82040 100644
--- a/akka-remote/src/main/scala/akka/remote/AccrualFailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/AccrualFailureDetector.scala
@@ -11,8 +11,6 @@ import scala.annotation.tailrec
 
 import System.{ currentTimeMillis ⇒ newTimestamp }
 
-import akka.actor.ActorSystem
-
 /**
  * Implementation of 'The Phi Accrual Failure Detector' by Hayashibara et al. as defined in their paper:
  * [http://ddg.jaist.ac.jp/pub/HDY+04.pdf]
diff --git a/akka-remote/src/main/scala/akka/remote/Gossiper.scala b/akka-remote/src/main/scala/akka/remote/Gossiper.scala
index 2ff25df939..6cdea287d4 100644
--- a/akka-remote/src/main/scala/akka/remote/Gossiper.scala
+++ b/akka-remote/src/main/scala/akka/remote/Gossiper.scala
@@ -9,7 +9,6 @@ import akka.actor.Status._
 import akka.event.Logging
 import akka.util.Duration
 import akka.config.ConfigurationException
-import akka.serialization.SerializationExtension
 
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.TimeUnit.SECONDS
@@ -19,7 +18,6 @@ import System.{ currentTimeMillis ⇒ newTimestamp }
 import scala.collection.immutable.Map
 import scala.annotation.tailrec
 
-import com.google.protobuf.ByteString
 import java.util.concurrent.TimeoutException
 import akka.dispatch.Await
 import akka.pattern.ask
diff --git a/akka-remote/src/main/scala/akka/remote/NetworkEventStream.scala b/akka-remote/src/main/scala/akka/remote/NetworkEventStream.scala
index c108b54ae7..4fb970262a 100644
--- a/akka-remote/src/main/scala/akka/remote/NetworkEventStream.scala
+++ b/akka-remote/src/main/scala/akka/remote/NetworkEventStream.scala
@@ -5,9 +5,7 @@
 package akka.remote
 
 import scala.collection.mutable
-import akka.actor.{ LocalActorRef, Actor, ActorRef, Props, newUuid }
-import akka.actor.Actor._
-import akka.actor.ActorSystemImpl
+import akka.actor.{ Actor, Props, ActorSystemImpl }
 
 /**
  * Stream of all kinds of network events, remote failure and connection events, cluster failure and connection events etc.
diff --git a/akka-remote/src/main/scala/akka/remote/Remote.scala b/akka-remote/src/main/scala/akka/remote/Remote.scala
index 923ccdc85d..03479e6ee4 100644
--- a/akka-remote/src/main/scala/akka/remote/Remote.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remote.scala
@@ -7,9 +7,7 @@ package akka.remote
 import akka.actor._
 import akka.event._
 import akka.util._
-import akka.util.duration._
-import akka.util.Helpers._
-import akka.serialization.{ JavaSerializer, Serialization, SerializationExtension }
+import akka.serialization.{ Serialization, SerializationExtension }
 import akka.dispatch.MessageDispatcher
 import akka.dispatch.SystemMessage
 import scala.annotation.tailrec
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 378d82096b..d8cebe9c31 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -6,16 +6,9 @@ package akka.remote
 
 import akka.actor._
 import akka.dispatch._
-import akka.util.duration._
-import akka.util.Timeout
-import akka.config.ConfigurationException
 import akka.event.{ DeathWatch, Logging }
-import akka.serialization.Compression.LZF
-import com.google.protobuf.ByteString
 import akka.event.EventStream
-import akka.dispatch.Promise
 import akka.config.ConfigurationException
-import java.util.concurrent.{ TimeoutException }
 
 /**
  * Remote ActorRefProvider. Starts up actor on remote node and creates a RemoteActorRef representing it.
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteConnectionManager.scala b/akka-remote/src/main/scala/akka/remote/RemoteConnectionManager.scala
index deed34521a..43c07e6968 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteConnectionManager.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteConnectionManager.scala
@@ -6,7 +6,6 @@ package akka.remote
 
 import akka.actor._
 import akka.routing._
-import akka.actor.ActorSystem
 import akka.event.Logging
 
 import scala.collection.immutable.Map
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteInterface.scala b/akka-remote/src/main/scala/akka/remote/RemoteInterface.scala
index a5474ce427..3f212f51f5 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteInterface.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteInterface.scala
@@ -7,13 +7,10 @@ package akka.remote
 import akka.actor._
 import akka.AkkaException
 import scala.reflect.BeanProperty
-import java.io.{ PrintWriter, PrintStream }
-import java.net.InetSocketAddress
 import java.net.URI
 import java.net.URISyntaxException
 import java.net.InetAddress
 import java.net.UnknownHostException
-import java.net.UnknownServiceException
 import akka.event.Logging
 
 /**
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
index 8a9a55a679..a1227ff69c 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
@@ -8,7 +8,6 @@ import akka.util.Duration
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import java.net.InetAddress
 import akka.config.ConfigurationException
-import com.eaio.uuid.UUID
 import scala.collection.JavaConverters._
 
 class RemoteSettings(val config: Config, val systemName: String) {
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index 4e80c84fb5..b962426577 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -4,7 +4,7 @@
 
 package akka.remote.netty
 
-import akka.actor.{ ActorRef, IllegalActorStateException, simpleName }
+import akka.actor.{ ActorRef, simpleName }
 import akka.remote._
 import RemoteProtocol._
 import akka.util._
@@ -25,7 +25,6 @@ import akka.actor.ActorSystemImpl
 import org.jboss.netty.handler.execution.{ ExecutionHandler, OrderedMemoryAwareThreadPoolExecutor }
 import java.util.concurrent._
 import locks.ReentrantReadWriteLock
-import akka.dispatch.MonitorableThreadFactory
 
 class RemoteClientMessageBufferException(message: String, cause: Throwable = null) extends AkkaException(message, cause) {
   def this(msg: String) = this(msg, null)
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala
index bbf653a808..57c949a655 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala
@@ -1,11 +1,8 @@
 package akka.remote
 
-import akka.remote._
-import akka.routing._
 import akka.actor.{ Actor, Props }
 import akka.testkit._
 import akka.dispatch.Await
-import akka.pattern.ask
 
 object DirectRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
   override def NrOfNodes = 2
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala
index 985e8bf835..563fbc4049 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala
@@ -1,12 +1,8 @@
 package akka.remote
 
 import akka.actor.{ Actor, Props }
-import akka.remote._
-import akka.routing._
 import akka.testkit._
-import akka.util.duration._
 import akka.dispatch.Await
-import akka.pattern.ask
 
 object NewRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
   override def NrOfNodes = 2
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala
index 2c2f0c154f..3e1339b8d4 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala
@@ -1,11 +1,9 @@
 package akka.remote
 
 import akka.actor.{ Actor, Props }
-import akka.remote._
 import akka.routing._
 import akka.testkit.DefaultTimeout
 import akka.dispatch.Await
-import akka.pattern.ask
 
 object RandomRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
   override def NrOfNodes = 4
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala
index f8ae8f635c..7a7b6dce95 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala
@@ -1,11 +1,9 @@
 package akka.remote
 
 import akka.actor.{ Actor, Props }
-import akka.remote._
 import akka.routing._
 import akka.testkit.DefaultTimeout
 import akka.dispatch.Await
-import akka.pattern.ask
 
 object RoundRobinRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
   override def NrOfNodes = 4
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala
index 48ef5adcc9..ce9e483c07 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala
@@ -1,7 +1,6 @@
 package akka.remote
 
 import akka.actor.{ Actor, Props }
-import akka.remote._
 import akka.routing._
 import akka.testkit._
 import akka.util.duration._

From 09a7ca2026bbe9b4566f02950220a1f2ad6be9ad Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 15:57:19 +0100
Subject: [PATCH 06/11] Removing dead imports from sbt plugin

---
 akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala | 1 -
 1 file changed, 1 deletion(-)

diff --git a/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala b/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
index 5031723f44..5c1c5045af 100644
--- a/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
+++ b/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
@@ -11,7 +11,6 @@ import sbt.classpath.ClasspathUtilities
 import sbt.Project.Initialize
 import sbt.CommandSupport._
 import java.io.File
-import scala.collection.mutable.{ Set ⇒ MutableSet }
 
 object AkkaKernelPlugin extends Plugin {
 

From 2e834b08e27be6ccf2c2459fa825b05af20112f3 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 15:59:37 +0100
Subject: [PATCH 07/11] Removing dead imports from testkit

---
 .../main/scala/akka/testkit/CallingThreadDispatcher.scala    | 1 -
 akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala  | 4 ----
 .../src/main/scala/akka/testkit/TestEventListener.scala      | 2 --
 akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala    | 5 +----
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
index 96d9f8241a..af2c44611a 100644
--- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
@@ -11,7 +11,6 @@ import scala.annotation.tailrec
 
 import com.typesafe.config.Config
 
-import CallingThreadDispatcher.Id
 import akka.actor.{ ExtensionIdProvider, ExtensionId, Extension, ExtendedActorSystem, ActorRef, ActorCell }
 import akka.dispatch.{ TaskInvocation, SystemMessage, Suspend, Resume, MessageDispatcherConfigurator, MessageDispatcher, Mailbox, Envelope, DispatcherPrerequisites, DefaultSystemMessageQueue }
 import akka.util.duration.intToDurationInt
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
index 7b3ee7ebce..18618a8f0c 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
@@ -6,11 +6,7 @@ package akka.testkit
 
 import akka.actor._
 import akka.util.{ ReflectiveAccess, Duration }
-import com.eaio.uuid.UUID
-import akka.actor.Props._
-import akka.actor.ActorSystem
 import java.util.concurrent.atomic.AtomicLong
-import akka.event.EventStream
 import scala.collection.immutable.Stack
 import akka.dispatch._
 import akka.pattern.ask
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala
index d191b11eab..56ced17370 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala
@@ -3,13 +3,11 @@
  */
 package akka.testkit
 
-import scala.annotation.tailrec
 import scala.util.matching.Regex
 import akka.actor.{ DeadLetter, ActorSystem, Terminated }
 import akka.dispatch.{ SystemMessage, Terminate }
 import akka.event.Logging.{ Warning, LogEvent, InitializeLogger, Info, Error, Debug, LoggerInitialized }
 import akka.event.Logging
-import akka.testkit.TestEvent.{ UnMute, Mute }
 import akka.util.Duration
 
 /**
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala
index fd3567f19c..f6d0ecfbce 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala
@@ -6,10 +6,7 @@ package akka.testkit
 
 import akka.actor._
 import akka.util._
-import com.eaio.uuid.UUID
-import akka.actor.ActorSystem
-import akka.event.EventStream
-import akka.dispatch.{ DispatcherPrerequisites, Mailbox }
+import akka.dispatch.DispatcherPrerequisites
 
 /**
  * This is a specialised form of the TestActorRef with support for querying and

From f85070c68a1abaeeac02e1286495b73130d78b0b Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 16:00:43 +0100
Subject: [PATCH 08/11] Removing dead imports for transactors

---
 .../src/main/scala/akka/transactor/UntypedTransactor.scala       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/akka-transactor/src/main/scala/akka/transactor/UntypedTransactor.scala b/akka-transactor/src/main/scala/akka/transactor/UntypedTransactor.scala
index ce77959a4f..0ffbd5e65c 100644
--- a/akka-transactor/src/main/scala/akka/transactor/UntypedTransactor.scala
+++ b/akka-transactor/src/main/scala/akka/transactor/UntypedTransactor.scala
@@ -6,7 +6,6 @@ package akka.transactor
 
 import akka.actor.{ UntypedActor, ActorRef }
 import scala.collection.JavaConversions._
-import scala.concurrent.stm.InTxn
 import java.util.{ Set ⇒ JSet }
 
 /**

From 2f5e58f0922704ca01b74405a3c42bcf3971c496 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 16:02:03 +0100
Subject: [PATCH 09/11] Removing dead imports from 0mq

---
 .../src/main/scala/akka/zeromq/ConcurrentSocketActor.scala       | 1 -
 akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
index ad6cf0ff72..254a097d80 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
@@ -8,7 +8,6 @@ import org.zeromq.{ ZMQ ⇒ JZMQ }
 import akka.actor._
 import akka.dispatch.{ Promise, Future }
 import akka.event.Logging
-import akka.util.duration._
 import annotation.tailrec
 import akka.util.Duration
 import java.util.concurrent.TimeUnit
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
index c0486fa3ab..20dbb0724a 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
@@ -3,7 +3,6 @@
  */
 package akka.zeromq
 
-import akka.util.duration._
 import org.zeromq.{ ZMQ ⇒ JZMQ }
 import akka.actor._
 import akka.dispatch.{ Await }

From fb03dd97dc8112c4ef701fbfe64c9fbc4d288dce Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 16:12:28 +0100
Subject: [PATCH 10/11] Fixing multi-jvm tests

---
 .../scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala  | 1 +
 .../multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala | 1 +
 .../scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala  | 1 +
 .../akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala
index 57c949a655..5f1c806998 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala
@@ -3,6 +3,7 @@ package akka.remote
 import akka.actor.{ Actor, Props }
 import akka.testkit._
 import akka.dispatch.Await
+import akka.pattern.ask
 
 object DirectRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
   override def NrOfNodes = 2
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala
index 563fbc4049..cef76e1b5a 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala
@@ -3,6 +3,7 @@ package akka.remote
 import akka.actor.{ Actor, Props }
 import akka.testkit._
 import akka.dispatch.Await
+import akka.pattern.ask
 
 object NewRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
   override def NrOfNodes = 2
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala
index 3e1339b8d4..887493a5fa 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala
@@ -4,6 +4,7 @@ import akka.actor.{ Actor, Props }
 import akka.routing._
 import akka.testkit.DefaultTimeout
 import akka.dispatch.Await
+import akka.pattern.ask
 
 object RandomRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
   override def NrOfNodes = 4
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala
index 7a7b6dce95..d699a41585 100644
--- a/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala
@@ -4,6 +4,7 @@ import akka.actor.{ Actor, Props }
 import akka.routing._
 import akka.testkit.DefaultTimeout
 import akka.dispatch.Await
+import akka.pattern.ask
 
 object RoundRobinRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
   override def NrOfNodes = 4

From 9de08bb4ce191b733e5cabb9326fd1677ebed74c Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Jan 2012 16:23:06 +0100
Subject: [PATCH 11/11] Review comments addressed

---
 akka-actor/src/main/scala/akka/dispatch/Future.scala | 2 +-
 akka-actor/src/main/scala/akka/util/ByteString.scala | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 2663aff23e..495faba5d6 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -10,7 +10,7 @@ import akka.japi.{ Function ⇒ JFunc, Option ⇒ JOption }
 
 import scala.util.continuations._
 
-import java.util.concurrent.TimeUnit.{ NANOSECONDS }
+import java.util.concurrent.TimeUnit.NANOSECONDS
 import java.lang.{ Iterable ⇒ JIterable }
 import java.util.{ LinkedList ⇒ JLinkedList }
 
diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala
index dd38fe3bdd..ce23d0f354 100644
--- a/akka-actor/src/main/scala/akka/util/ByteString.scala
+++ b/akka-actor/src/main/scala/akka/util/ByteString.scala
@@ -1,12 +1,11 @@
 package akka.util
 
 import java.nio.ByteBuffer
-import java.nio.charset.Charset
 
-import scala.collection.{ IndexedSeqOptimized }
+import scala.collection.IndexedSeqOptimized
 import scala.collection.mutable.{ Builder, WrappedArray }
 import scala.collection.immutable.{ IndexedSeq, VectorBuilder }
-import scala.collection.generic.{ CanBuildFrom }
+import scala.collection.generic.CanBuildFrom
 
 object ByteString {