diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index 69b5d720f1..c569c4946a 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -590,7 +590,7 @@ private[akka] class ActorCell(
         e match {
           case i: InstantiationException ⇒ throw ActorInitializationException(self,
             """exception during creation, this problem is likely to occur because the class of the Actor you tried to create is either,
-               a non-static inner class (in which case make it a static inner class or use Props(new ...) or Props( new UntypedActorFactory ... )
+               a non-static inner class (in which case make it a static inner class or use Props(new ...) or Props( new Creator ... )
                or is missing an appropriate, reachable no-args constructor.
               """, i.getCause)
           case x ⇒ throw ActorInitializationException(self, "exception during creation", x)
diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala
index 8e39bfbd13..d84d9927f5 100644
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.scala
@@ -278,7 +278,6 @@ trait IndirectActorProducer {
 }
 
 private[akka] object IndirectActorProducer {
-  val UntypedActorFactoryConsumerClass = classOf[UntypedActorFactoryConsumer]
   val CreatorFunctionConsumerClass = classOf[CreatorFunctionConsumer]
   val CreatorConsumerClass = classOf[CreatorConsumer]
   val TypedCreatorFunctionConsumerClass = classOf[TypedCreatorFunctionConsumer]
@@ -292,8 +291,6 @@ private[akka] object IndirectActorProducer {
       clazz match {
         case TypedCreatorFunctionConsumerClass ⇒
           new TypedCreatorFunctionConsumer(get1stArg, get2ndArg)
-        case UntypedActorFactoryConsumerClass ⇒
-          new UntypedActorFactoryConsumer(get1stArg)
         case CreatorFunctionConsumerClass ⇒
           new CreatorFunctionConsumer(get1stArg)
         case CreatorConsumerClass ⇒
@@ -308,14 +305,6 @@ private[akka] object IndirectActorProducer {
   }
 }
 
-/**
- * INTERNAL API
- */
-private[akka] class UntypedActorFactoryConsumer(factory: UntypedActorFactory) extends IndirectActorProducer {
-  override def actorClass = classOf[Actor]
-  override def produce() = factory.create()
-}
-
 /**
  * INTERNAL API
  */
diff --git a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
index 347822c42e..6a3b643d86 100644
--- a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
@@ -177,8 +177,3 @@ abstract class UntypedActor extends Actor {
 
 }
 
-/**
- * Factory closure for an UntypedActor, to be used with 'Actors.actorOf(factory)'.
- */
-@deprecated("use Creator<T> instead", "2.2")
-trait UntypedActorFactory extends Creator[Actor] with Serializable
diff --git a/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.java b/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.java
index 121e3b8e7b..9bfead5b30 100644
--- a/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.java
+++ b/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.java
@@ -61,7 +61,6 @@ import akka.actor.Terminated;
 //#import-terminated
 //#import-untypedActor
 import akka.actor.UntypedActor;
-import akka.actor.UntypedActorFactory;
 //#import-untypedActor
 //#import-stash
 import akka.actor.UntypedActorWithStash;
diff --git a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
index ca326eff7b..878c6f39bc 100644
--- a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
+++ b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
@@ -42,3 +42,5 @@ The following, previously deprecated, features have been removed:
 * Timeout constructor without unit
  
 * JavaLoggingEventHandler, replaced by JavaLogger
+
+* UntypedActorFactory