More actorref refactoring