diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 940a60e597..74633b9a20 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -137,17 +137,6 @@ abstract class ActorRef extends ActorRefShared with UntypedChannel with ReplyCha
    */
   def unlink(actorRef: ActorRef): ActorRef
 
-  /**
-   * Returns the supervisor, if there is one.
-   */
-  def supervisor: Option[ActorRef]
-
-  /**
-   * Akka Java API. <p/>
-   * Returns the supervisor, if there is one.
-   */
-  def getSupervisor: ActorRef = supervisor getOrElse null
-
   protected[akka] def postMessageToMailbox(message: Any, channel: UntypedChannel): Unit
 
   protected[akka] def postMessageToMailboxAndCreateFutureResultWithTimeout(
@@ -246,11 +235,6 @@ class LocalActorRef private[akka] (
    */
   def unlink(subject: ActorRef): ActorRef = actorCell.unlink(subject)
 
-  /**
-   * Returns the supervisor, if there is one.
-   */
-  def supervisor: Option[ActorRef] = actorCell.supervisor
-
   // ========= AKKA PROTECTED FUNCTIONS =========
 
   protected[akka] def actorClass: Class[_] = actorCell.actorClass
@@ -366,8 +350,6 @@ private[akka] case class RemoteActorRef private[akka] (
 
   def unlink(actorRef: ActorRef): ActorRef = unsupported
 
-  def supervisor: Option[ActorRef] = unsupported
-
   protected[akka] def restart(): Unit = unsupported
 
   private def unsupported = throw new UnsupportedOperationException("Not supported for RemoteActorRef")
@@ -460,8 +442,6 @@ trait UnsupportedActorRef extends ActorRef with ScalaActorRef {
 
   def unlink(actorRef: ActorRef): ActorRef = unsupported
 
-  def supervisor: Option[ActorRef] = unsupported
-
   def suspend(): Unit = unsupported
 
   def resume(): Unit = unsupported
diff --git a/akka-camel/src/main/scala/akka/camel/component/ActorComponent.scala b/akka-camel/src/main/scala/akka/camel/component/ActorComponent.scala
index 3196c78986..a87bd5fb76 100644
--- a/akka-camel/src/main/scala/akka/camel/component/ActorComponent.scala
+++ b/akka-camel/src/main/scala/akka/camel/component/ActorComponent.scala
@@ -298,7 +298,6 @@ private[akka] class AsyncCallbackAdapter(exchange: Exchange, callback: AsyncCall
   def dispatcher: MessageDispatcher = unsupported
   def link(actorRef: ActorRef): ActorRef = unsupported
   def unlink(actorRef: ActorRef): ActorRef = unsupported
-  def supervisor: Option[ActorRef] = unsupported
 
   protected[akka] def postMessageToMailboxAndCreateFutureResultWithTimeout(message: Any, timeout: Timeout, channel: UntypedChannel) = unsupported
   protected[akka] def restart(reason: Throwable, maxNrOfRetries: Option[Int], withinTimeRange: Option[Int]): Unit = unsupported
diff --git a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
index d7bf0821f7..8e428e4552 100644
--- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
@@ -53,6 +53,7 @@ object ActorSerialization {
     replicationScheme: ReplicationScheme): Array[Byte] =
     toBinary(a, srlMailBox, replicationScheme)
 
+  @deprecated("BROKEN, REMOVE ME")
   private[akka] def toSerializedActorRefProtocol[T <: Actor](
     actorRef: ActorRef,
     serializeMailBox: Boolean,
@@ -63,13 +64,6 @@ object ActorSerialization {
       case _                ⇒ None
     }
 
-    val lifeCycleProtocol: Option[LifeCycleProtocol] = None /*{
-      actorRef.lifeCycle match {
-        case Permanent ⇒ Some(LifeCycleProtocol.newBuilder.setLifeCycle(LifeCycleType.PERMANENT).build)
-        case Temporary ⇒ Some(LifeCycleProtocol.newBuilder.setLifeCycle(LifeCycleType.TEMPORARY).build)
-      }
-    }*/
-
     val builder = SerializedActorRefProtocol.newBuilder
       .setUuid(UuidProtocol.newBuilder.setHigh(actorRef.uuid.getTime).setLow(actorRef.uuid.getClockSeqAndNode).build)
       .setAddress(actorRef.address)
@@ -96,9 +90,6 @@ object ActorSerialization {
         builder.setReplicationStrategy(strategyType)
     }
 
-    lifeCycleProtocol.foreach(builder.setLifeCycle(_))
-    actorRef.supervisor.foreach(s ⇒ builder.setSupervisor(RemoteActorSerialization.toRemoteActorRefProtocol(s)))
-
     localRef foreach { l ⇒
       if (serializeMailBox) {
         l.underlying.mailbox match {