Refactor RemoteNode register/unregister