diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
index aa5151c282..680bb39015 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
@@ -3,19 +3,20 @@
  */
 package akka.cluster
 
+import com.typesafe.config.Config
+
+import akka.ConfigurationException
 import akka.actor.ActorSystem
+import akka.actor.Deploy
 import akka.actor.DynamicAccess
+import akka.actor.NoScopeGiven
 import akka.actor.Scheduler
+import akka.actor.Scope
+import akka.cluster.routing.ClusterRouterConfig
 import akka.event.EventStream
 import akka.remote.RemoteActorRefProvider
 import akka.remote.RemoteDeployer
-import akka.actor.Deploy
-import com.typesafe.config.Config
-import akka.ConfigurationException
-import akka.actor.NoScopeGiven
 import akka.routing.RemoteRouterConfig
-import akka.cluster.routing.ClusterRouterConfig
-import akka.actor.Scope
 
 class ClusterActorRefProvider(
   _systemName: String,
diff --git a/akka-cluster/src/main/scala/akka/cluster/package.scala b/akka-cluster/src/main/scala/akka/cluster/package.scala
index 2db1790362..4d1931fcc2 100644
--- a/akka-cluster/src/main/scala/akka/cluster/package.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/package.scala
@@ -5,9 +5,9 @@
 package akka.cluster
 
 import language.implicitConversions
+import akka.actor.Deploy
 import akka.actor.Props
 import akka.routing.RouterConfig
-import akka.actor.Deploy
 
 package object routing {
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
index 9bc4781633..d79bdec56f 100644
--- a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
@@ -3,11 +3,12 @@
  */
 package akka.cluster.routing
 
+import java.lang.IllegalStateException
 import java.util.concurrent.atomic.AtomicInteger
 import scala.collection.immutable.SortedSet
 import com.typesafe.config.ConfigFactory
+
 import akka.ConfigurationException
-import akka.actor.Actor
 import akka.actor.ActorRef
 import akka.actor.ActorSystemImpl
 import akka.actor.Address
@@ -20,16 +21,12 @@ import akka.cluster.ClusterEvent._
 import akka.cluster.Member
 import akka.cluster.MemberStatus
 import akka.remote.RemoteScope
+import akka.routing.Destination
 import akka.routing.Resizer
 import akka.routing.Route
 import akka.routing.RouteeProvider
 import akka.routing.Router
 import akka.routing.RouterConfig
-import java.lang.IllegalStateException
-import akka.cluster.ClusterScope
-import akka.routing.RoundRobinRouter
-import akka.routing.Destination
-import java.lang.IllegalStateException
 import akka.routing.RouterContext
 
 /**
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
index fe1498a3cd..bfa50a472a 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
@@ -3,27 +3,23 @@
  */
 package akka.cluster.routing
 
-import language.postfixOps
+import scala.concurrent.Await
+import scala.concurrent.util.duration._
+import com.typesafe.config.ConfigFactory
+
 import akka.actor.Actor
 import akka.actor.ActorRef
-import akka.actor.Props
-import akka.actor.PoisonPill
 import akka.actor.Address
-import scala.concurrent.Await
+import akka.actor.Props
+import akka.cluster.MultiNodeClusterSpec
 import akka.pattern.ask
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
-import akka.routing.Broadcast
+import akka.routing.CurrentRoutees
 import akka.routing.RoundRobinRouter
 import akka.routing.RoutedActorRef
-import akka.testkit._
-import scala.concurrent.util.duration._
-import akka.cluster.MultiNodeClusterSpec
-import com.typesafe.config.ConfigFactory
-import akka.cluster.Cluster
-import akka.actor.Deploy
-import akka.routing.CurrentRoutees
 import akka.routing.RouterRoutees
+import akka.testkit._
 
 object ClusterRoundRobinRoutedActorMultiJvmSpec extends MultiNodeConfig {