diff --git a/server/api/src/main/scala/org/eigengo/akkapatterns/api/boot.scala b/server/api/src/main/scala/org/eigengo/akkapatterns/api/boot.scala
index 4bdf569..3b6f444 100644
--- a/server/api/src/main/scala/org/eigengo/akkapatterns/api/boot.scala
+++ b/server/api/src/main/scala/org/eigengo/akkapatterns/api/boot.scala
@@ -48,10 +48,6 @@ trait Api extends RouteConcatenation {
   val routes =
     new RecogService(recogCoordinator, actorSystem.settings.config.getString("server.web-server")).route
 
-  def rejectionHandler: PartialFunction[scala.List[Rejection], HttpResponse] = {
-    case (rejections: List[Rejection]) => HttpResponse(StatusCodes.BadRequest)
-  }
-
   val rootService = actorSystem.actorOf(Props(new RoutedHttpService(routes)))
 
 }
diff --git a/server/api/src/main/scala/org/eigengo/akkapatterns/api/customer.scala b/server/api/src/main/scala/org/eigengo/akkapatterns/api/customer.scala
index 4b5fc2a..b948f93 100644
--- a/server/api/src/main/scala/org/eigengo/akkapatterns/api/customer.scala
+++ b/server/api/src/main/scala/org/eigengo/akkapatterns/api/customer.scala
@@ -6,6 +6,7 @@ import org.eigengo.akkapatterns.core.CustomerController
 import akka.util.Timeout
 import scala.concurrent.Future
 import java.util.Date
+import org.eigengo.akkapatterns.domain.CustomerFormats
 
 trait CustomerService extends HttpService {
   this: EndpointMarshalling with AuthenticationDirectives =>
diff --git a/server/api/src/main/scala/org/eigengo/akkapatterns/api/marshalling.scala b/server/api/src/main/scala/org/eigengo/akkapatterns/api/marshalling.scala
index ff578bc..e990476 100644
--- a/server/api/src/main/scala/org/eigengo/akkapatterns/api/marshalling.scala
+++ b/server/api/src/main/scala/org/eigengo/akkapatterns/api/marshalling.scala
@@ -58,4 +58,4 @@ trait EitherErrorMarshalling {
 trait EndpointMarshalling extends MetaMarshallers with SprayJsonSupport
   with ApiMarshalling
   with UserFormats with CustomerFormats
-  with EitherErrorMarshalling
+  with EitherErrorMarshalling
\ No newline at end of file
diff --git a/server/core/src/main/scala/org/eigengo/akkapatterns/core/CoreActorRefs.scala b/server/core/src/main/scala/org/eigengo/akkapatterns/core/CoreActorRefs.scala
deleted file mode 100644
index 9f8ae86..0000000
--- a/server/core/src/main/scala/org/eigengo/akkapatterns/core/CoreActorRefs.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eigengo.akkapatterns.core
-
-import akka.actor.ActorSystem
-
-
-trait CoreActorRefs {
-
-  def system: ActorSystem
-
-  def coordinatorActor = system.actorFor("/user/recog/coordinator")
-//  def applicationActor = system.actorFor("/user/application")
-//  def userActor = system.actorFor("/user/application/user")
-//  def loginActor = system.actorFor("/user/application/authentication/login")
-
-}
diff --git a/server/core/src/main/scala/org/eigengo/akkapatterns/core/boot.scala b/server/core/src/main/scala/org/eigengo/akkapatterns/core/boot.scala
index b740282..17a525a 100644
--- a/server/core/src/main/scala/org/eigengo/akkapatterns/core/boot.scala
+++ b/server/core/src/main/scala/org/eigengo/akkapatterns/core/boot.scala
@@ -31,8 +31,8 @@ trait ServerCore {
   this: AmqpServerCore =>
   def actorSystem: ActorSystem
 
-  lazy val recogCoordinator = actorSystem.actorOf(Props(new RecogCoordinatorActor(connectionActor)))
+  lazy val recogCoordinator = actorSystem.actorOf(Props(classOf[RecogCoordinatorActor], connectionActor))
   lazy val messageDelivery = actorSystem.actorOf(Props[MessageDeliveryActor].withDispatcher("low-priority-dispatcher"))
-  lazy val userActor = actorSystem.actorOf(Props(new UserActor(messageDelivery)))
-  lazy val loginActor = actorSystem.actorOf(Props(new LoginActor(messageDelivery)))
+  lazy val userActor = actorSystem.actorOf(Props(classOf[UserActor], messageDelivery))
+  lazy val loginActor = actorSystem.actorOf(Props(classOf[LoginActor], messageDelivery))
 }
diff --git a/server/core/src/main/scala/org/eigengo/akkapatterns/core/recog/coordinator.scala b/server/core/src/main/scala/org/eigengo/akkapatterns/core/recog/coordinator.scala
index 4a04051..241f6d0 100644
--- a/server/core/src/main/scala/org/eigengo/akkapatterns/core/recog/coordinator.scala
+++ b/server/core/src/main/scala/org/eigengo/akkapatterns/core/recog/coordinator.scala
@@ -43,7 +43,7 @@ class RecogCoordinatorActor(connectionActor: ActorRef) extends Actor {
   def receive = {
     case Begin =>
       val id = UUID.randomUUID()
-      val instanceActor = context.actorOf(Props(new RecogSessionActor(connectionActor)), id.toString)
+      val instanceActor = context.actorOf(Props(classOf[RecogSessionActor], connectionActor), id.toString)
       instanceActor ! SessionConfiguration(FaceFeature :: Nil)
       sender ! id
     case ProcessImage(id, image) =>
diff --git a/server/project/build.scala b/server/project/build.scala
index f957506..a5707b9 100644
--- a/server/project/build.scala
+++ b/server/project/build.scala
@@ -119,7 +119,7 @@ object Dependencies {
     ExclusionRule(organization = "org.slf4j")
   )
 
-  val akka_version = "2.1.2"
+  val akka_version = "2.2-M3"
   val spray_version = "1.1-M7"
 
   val java_logging = "com.github.fommil" % "java-logging" % "1.0"