Refactor: unregisterNode