diff --git a/akka-actor/src/main/resources/logback.xml b/akka-actor/src/main/resources/logback.xml
deleted file mode 100644
index 4635396601..0000000000
--- a/akka-actor/src/main/resources/logback.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-        <!-- FOR AKKA INTERNAL USE ONLY -->
-<configuration scan="false" debug="false">
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>[%4p] [%d{ISO8601}] [%t] %c{1}: %m%n</pattern>
-    </encoder>
-  </appender>
-  <appender name="R" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>./logs/akka.log</File>
-    <encoder>
-      <pattern>[%4p] [%d{ISO8601}] [%t] %c{1}: %m%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>./logs/akka.log.%d{yyyy-MM-dd-HH}</fileNamePattern>
-    </rollingPolicy>
-  </appender>
-  <logger name="se.scalablesolutions" level="DEBUG"/>
-  <root level="INFO">
-    <appender-ref ref="stdout"/>
-    <appender-ref ref="R"/>
-  </root>
-</configuration>
diff --git a/akka-actor/src/main/scala/actor/ActorRegistry.scala b/akka-actor/src/main/scala/actor/ActorRegistry.scala
index 6c6056221a..f3a479e6fd 100644
--- a/akka-actor/src/main/scala/actor/ActorRegistry.scala
+++ b/akka-actor/src/main/scala/actor/ActorRegistry.scala
@@ -205,6 +205,14 @@ class Index[K <: AnyRef,V <: AnyRef : Manifest] {
      set foreach fun
   }
 
+  def findValue(key: K)(f: (V) => Boolean): Option[V] = {
+    val set = container get key
+    if (set ne null)
+     set.iterator.find(f)
+    else
+     None
+  }
+
   def foreach(fun: (K,V) => Unit) {
     container.entrySet foreach {
       (e) => e.getValue.foreach(fun(e.getKey,_))
diff --git a/akka-actor/src/test/resources/logback-test.xml b/akka-actor/src/test/resources/logback-test.xml
deleted file mode 100644
index 78eae40ec4..0000000000
--- a/akka-actor/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration scan="false" debug="false">
-  <!-- FOR AKKA INTERNAL USE ONLY -->
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>[%4p] [%d{ISO8601}] [%t] %c{1}: %m%n</pattern>
-    </encoder>
-  </appender>
-  <logger name="se.scalablesolutions" level="DEBUG"/>
-  <root level="DEBUG">
-    <appender-ref ref="stdout"/>
-  </root>
-</configuration>
diff --git a/akka-http/src/main/scala/AkkaBroadcaster.scala b/akka-http/src/main/scala/AkkaBroadcaster.scala
index 8f724ff445..ca5abc6f1d 100644
--- a/akka-http/src/main/scala/AkkaBroadcaster.scala
+++ b/akka-http/src/main/scala/AkkaBroadcaster.scala
@@ -9,10 +9,13 @@ import se.scalablesolutions.akka.actor.Actor._
 import se.scalablesolutions.akka.actor.Actor
 import se.scalablesolutions.akka.dispatch.Dispatchers
 
-class AkkaBroadcaster extends org.atmosphere.jersey.JerseyBroadcaster {
-  name = classOf[AkkaBroadcaster].getName
-
+object AkkaBroadcaster {
   val broadcasterDispatcher = Dispatchers.fromConfig("akka.rest.comet-dispatcher")
+}
+
+class AkkaBroadcaster extends org.atmosphere.jersey.JerseyBroadcaster {
+  import AkkaBroadcaster._
+  name = classOf[AkkaBroadcaster].getName
 
   //FIXME should be supervised
   val caster = actorOf(new Actor {
diff --git a/akka-remote/src/test/resources/logback-test.xml b/akka-remote/src/test/resources/logback-test.xml
deleted file mode 100644
index 78eae40ec4..0000000000
--- a/akka-remote/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration scan="false" debug="false">
-  <!-- FOR AKKA INTERNAL USE ONLY -->
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>[%4p] [%d{ISO8601}] [%t] %c{1}: %m%n</pattern>
-    </encoder>
-  </appender>
-  <logger name="se.scalablesolutions" level="DEBUG"/>
-  <root level="DEBUG">
-    <appender-ref ref="stdout"/>
-  </root>
-</configuration>