diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index d00ca86adb..b3459ca925 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -9,12 +9,12 @@ import akka.experimental
 import akka.dispatch._
 import akka.config._
 import Config._
-import akka.util.{ ListenerManagement, ReflectiveAccess, Duration, Helpers }
+import akka.util.{ ReflectiveAccess, Duration }
 import ReflectiveAccess._
 import akka.remoteinterface.RemoteSupport
 import akka.japi.{ Creator, Procedure }
 import akka.AkkaException
-import akka.serialization.{ Format, Serializer, Serialization }
+import akka.serialization.{ Serializer, Serialization }
 import akka.cluster.ClusterNode
 import akka.event.EventHandler
 import scala.collection.immutable.Stack
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
index 29da2fac04..314b2a5076 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
@@ -5,16 +5,10 @@
 package akka.actor
 
 import scala.collection.mutable.ListBuffer
-import scala.reflect.Manifest
-import annotation.tailrec
 
-import java.util.concurrent.{ ConcurrentSkipListSet, ConcurrentHashMap }
-import java.util.{ Set ⇒ JSet }
+import java.util.concurrent.ConcurrentHashMap
 
-import akka.util.Index
-import akka.util.ReflectiveAccess._
 import akka.util.ListenerManagement
-import akka.serialization._
 
 /**
  * Base trait for ActorRegistry events, allows listen to when an actor is added and removed from the ActorRegistry.
diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala
index 818bd09de9..8d28897aa7 100644
--- a/akka-actor/src/main/scala/akka/actor/Deployer.scala
+++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala
@@ -12,8 +12,6 @@ import akka.event.EventHandler
 import akka.actor.DeploymentConfig._
 import akka.util.ReflectiveAccess._
 import akka.AkkaException
-import akka.serialization.{ Serializer, Serialization }
-import akka.util.ReflectiveAccess
 import akka.config.{ Configuration, ConfigurationException, Config }
 
 trait ActorDeployer {
diff --git a/akka-actor/src/main/scala/akka/actor/IO.scala b/akka-actor/src/main/scala/akka/actor/IO.scala
index 03de91900a..9b0f53180f 100644
--- a/akka-actor/src/main/scala/akka/actor/IO.scala
+++ b/akka-actor/src/main/scala/akka/actor/IO.scala
@@ -3,7 +3,6 @@
  */
 package akka.actor
 
-import akka.config.Supervision.Permanent
 import akka.util.ByteString
 import akka.dispatch.MessageInvocation
 
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 41eba5cd41..54076886f2 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -10,7 +10,6 @@ import akka.dispatch.{ MessageDispatcher, Dispatchers, Future, FutureTimeoutExce
 import java.lang.reflect.{ InvocationTargetException, Method, InvocationHandler, Proxy }
 import akka.util.{ Duration }
 import java.util.concurrent.atomic.{ AtomicReference ⇒ AtomVar }
-import com.sun.xml.internal.ws.developer.MemberSubmissionAddressing.Validation
 import akka.serialization.{ Serializer, Serialization }
 
 //TODO Document this class, not only in Scaladoc, but also in a dedicated typed-actor.rst, for both java and scala
diff --git a/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala b/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala
index 6c96ae1b0d..5bcbae8b10 100644
--- a/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala
+++ b/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala
@@ -6,7 +6,7 @@ package akka.config
 
 import akka.dispatch.MessageDispatcher
 import akka.actor.{ MaximumNumberOfRestartsWithinTimeRangeReached, ActorRef }
-import akka.japi.{ Procedure2, Procedure }
+import akka.japi.{ Procedure2 }
 
 case class RemoteAddress(val hostname: String, val port: Int)
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
index 8384fdf949..623490a88e 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
@@ -4,7 +4,7 @@
 
 package akka.dispatch
 
-import akka.actor.{ Actor, ActorRef }
+import akka.actor.ActorRef
 import akka.actor.newUuid
 import akka.config.Config._
 import akka.util.{ Duration, ReflectiveAccess }
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 4a53292512..380ad60254 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -6,13 +6,11 @@ package akka.dispatch
 
 import akka.AkkaException
 import akka.event.EventHandler
-import akka.actor.{ Actor, Channel, ForwardableChannel, NullChannel, UntypedChannel, ActorRef, Scheduler, Timeout, ExceptionChannel }
-import akka.util.{ Duration, BoxedType }
+import akka.actor.{ Actor, ForwardableChannel, UntypedChannel, Scheduler, Timeout, ExceptionChannel }
 import akka.japi.{ Procedure, Function ⇒ JFunc }
 
 import scala.util.continuations._
 
-import java.util.concurrent.locks.ReentrantLock
 import java.util.concurrent.{ ConcurrentLinkedQueue, TimeUnit, Callable }
 import java.util.concurrent.TimeUnit.{ NANOSECONDS ⇒ NANOS, MILLISECONDS ⇒ MILLIS }
 import java.lang.{ Iterable ⇒ JIterable }
@@ -23,7 +21,6 @@ import scala.collection.mutable.Stack
 import akka.util.{ Switch, Duration, BoxedType }
 
 import java.util.concurrent.atomic.{ AtomicReference, AtomicBoolean }
-import scala.Math
 
 class FutureTimeoutException(message: String, cause: Throwable = null) extends AkkaException(message, cause) {
   def this(message: String) = this(message, null)
@@ -863,6 +860,7 @@ class DefaultPromise[T](val timeout: Timeout)(implicit val dispatcher: MessageDi
 
   @inline
   private def currentTimeInNanos: Long = MILLIS.toNanos(System.currentTimeMillis) //TODO Switch to math.abs(System.nanoTime)?
+  //TODO: the danger of Math.abs is that it could break the ordering of time. So I would not recommend an abs.
   @inline
   private def timeLeft(): Long = timeoutInNanos - (currentTimeInNanos - _startTimeInNanos)
 }
diff --git a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
index 80c4a95031..fd7c7bb031 100644
--- a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
@@ -4,10 +4,8 @@
 
 package akka.dispatch
 
-import akka.util.Duration
-
 import java.util.concurrent.atomic.AtomicReference
-import akka.actor.{ Actor, ActorRef }
+import akka.actor.ActorRef
 
 /**
  * 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 be5d9dbf2a..a4a78bf8ba 100644
--- a/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala
@@ -5,10 +5,9 @@
 package akka.dispatch
 
 import akka.actor.Actor.TIMEOUT
-import java.util.concurrent.atomic.{ AtomicReference, AtomicBoolean }
+import java.util.concurrent.atomic.AtomicReference
 import scala.util.continuations._
 import scala.annotation.{ tailrec }
-import scala.collection.immutable.Queue
 
 object PromiseStream {
   def apply[A](timeout: Long = TIMEOUT): PromiseStream[A] = new PromiseStream[A](timeout)
diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
index 737b4dda59..c0b5dbc540 100644
--- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
@@ -11,7 +11,6 @@ import ThreadPoolExecutor.CallerRunsPolicy
 
 import akka.util.Duration
 import akka.event.EventHandler
-import concurrent.forkjoin.{ ForkJoinWorkerThread, ForkJoinTask, ForkJoinPool }
 
 object ThreadPoolConfig {
   type Bounds = Int
diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
index 82a327e571..ad80a79bab 100644
--- a/akka-actor/src/main/scala/akka/routing/Routing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Routing.scala
@@ -14,8 +14,7 @@ import akka.actor.UntypedChannel._
 import java.util.concurrent.atomic.{ AtomicReference, AtomicInteger }
 
 /**
- * An {@link AkkaException} thrown when something goes wrong while routing a message to a specific
- * connected ActorRef.
+ * An {@link AkkaException} thrown when something goes wrong while routing a message
  */
 class RoutingException(message: String) extends AkkaException(message)
 
diff --git a/akka-actor/src/main/scala/akka/serialization/Format.scala b/akka-actor/src/main/scala/akka/serialization/Format.scala
index d53a852379..43177862d4 100644
--- a/akka-actor/src/main/scala/akka/serialization/Format.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Format.scala
@@ -6,8 +6,6 @@ package akka.serialization
 
 import akka.actor.Actor
 
-import java.io.{ ObjectOutputStream, ByteArrayOutputStream, ObjectInputStream, ByteArrayInputStream }
-
 /**
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  * trait Serializer extends scala.Serializable {
diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
index 7d3375aff9..76c337845c 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
@@ -5,9 +5,7 @@
 package akka.serialization
 
 import akka.util.ReflectiveAccess._
-import akka.config.Config
 import akka.config.Config._
-import akka.actor.{ ActorRef, Actor }
 import akka.AkkaException
 import akka.util.ReflectiveAccess
 
diff --git a/akka-actor/src/main/scala/akka/util/AkkaLoader.scala b/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
index d3ff9bce32..54d9bd520b 100644
--- a/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
+++ b/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
@@ -5,7 +5,6 @@
 package akka.util
 
 import akka.config.Config
-import akka.actor.Actor
 
 /*
  * This class is responsible for booting up a stack of bundles and then shutting them down
diff --git a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
index 9f1311a349..4a82884f03 100644
--- a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
+++ b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
@@ -4,13 +4,12 @@
 
 package akka.util
 
-import akka.dispatch.{ Future, Promise, MessageInvocation }
+import akka.dispatch.MessageInvocation
 import akka.config.{ Config, ModuleNotAvailableException }
 import akka.remoteinterface.RemoteSupport
 import akka.actor._
-import DeploymentConfig.{ Deploy, ReplicationScheme, ReplicationStrategy }
+import DeploymentConfig.ReplicationScheme
 import akka.event.EventHandler
-import akka.serialization.Format
 import akka.cluster.ClusterNode
 
 import java.net.InetSocketAddress
diff --git a/akka-cluster/src/main/scala/akka/remote/MessageSerializer.scala b/akka-cluster/src/main/scala/akka/remote/MessageSerializer.scala
index 21060e7973..f54bd5da05 100644
--- a/akka-cluster/src/main/scala/akka/remote/MessageSerializer.scala
+++ b/akka-cluster/src/main/scala/akka/remote/MessageSerializer.scala
@@ -5,10 +5,9 @@
 package akka.remote
 
 import akka.remote.protocol.RemoteProtocol._
-import akka.util._
 import akka.serialization.Serialization
 
-import com.google.protobuf.{ Message, ByteString }
+import com.google.protobuf.ByteString
 
 object MessageSerializer {