Started refactoring for replacing actorrefs on reincarnation