diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index b2cf89c39e..7534a6de77 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -347,7 +347,6 @@ class ActorSystemImpl(val name: String, applicationConfig: Config) extends Actor
   // TODO why implicit val dispatcher?
   implicit val dispatcher = dispatcherFactory.defaultGlobalDispatcher
 
-  //FIXME Set this to a Failure when things bubble to the top. What does this mean?
   def terminationFuture: Future[Unit] = provider.terminationFuture
   def guardian: ActorRef = provider.guardian
   def systemGuardian: ActorRef = provider.systemGuardian
diff --git a/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala b/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala
index 6f8608378d..47c2cd86c7 100644
--- a/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala
+++ b/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala
@@ -57,8 +57,6 @@ trait BootableActorLoaderService extends Bootable {
 
   abstract override def onUnload() = {
     super.onUnload()
-
-    system.stop()
   }
 }
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 274f82fe6c..b9def99301 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -27,10 +27,7 @@ class FutureTimeoutException(message: String, cause: Throwable = null) extends A
   def this(message: String) = this(message, null)
 }
 
-class FutureFactory(dispatcher: MessageDispatcher, timeout: Timeout) {
-
-  // TODO: remove me ASAP !!!
-  implicit val _dispatcher = dispatcher
+class FutureFactory()(implicit dispatcher: MessageDispatcher, timeout: Timeout) {
 
   /**
    * Java API, equivalent to Future.apply
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index e08adeebb4..a0d63ecb2d 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -306,7 +306,7 @@ private[akka] case class RemoteActorRef private[akka] (
 
   def resume(): Unit = ()
 
-  def stop() { //FIXME send the cause as well! (WDYM?)
+  def stop() {
     synchronized {
       if (running) {
         running = false
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala b/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala
index 00bd3eadcf..3b0088d55c 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala
@@ -21,7 +21,6 @@ class RemoteExtensionSettings(val config: Config) extends Extension {
 
   import config._
 
-  val RemoteTransport = getString("akka.remote.transport")
   val FailureDetectorThreshold = getInt("akka.remote.failure-detector.threshold")
   val FailureDetectorMaxSampleSize = getInt("akka.remote.failure-detector.max-sample-size")
   val ShouldCompressData = config.getBoolean("akka.remote.use-compression")
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
index d11d07ddd3..156ad94ff7 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
@@ -12,7 +12,6 @@ class RemoteConfigSpec extends AkkaSpec("akka.cluster.nodename = node1") {
       import config._
 
       //akka.remote
-      getString("akka.remote.transport") must equal("akka.cluster.netty.NettyRemoteSupport")
       getString("akka.remote.secure-cookie") must equal("")
       getBoolean("akka.remote.use-passive-connections") must equal(true)
       // getMilliseconds("akka.remote.remote-daemon-ack-timeout") must equal(30 * 1000)