Refactor, removing State from ActorRef