diff --git a/Meshtastic.Cli/Commands/RemoveNodeCommand.cs b/Meshtastic.Cli/Commands/RemoveNodeCommand.cs
index 858b4af..ad0c6c1 100644
--- a/Meshtastic.Cli/Commands/RemoveNodeCommand.cs
+++ b/Meshtastic.Cli/Commands/RemoveNodeCommand.cs
@@ -11,13 +11,15 @@ public RemoveNodeCommand(string name, string description, Option<string> port, O
         Option<OutputFormat> output, Option<LogLevel> log, Option<uint?> dest, Option<bool> selectDest) :
         base(name, description)
     {
-        var nodeNum = new Argument<uint>("nodenum", "Nodenum of the node to remove from the device NodeDB");
+        var nodeNumArgument = new Argument<uint>("nodenum", "Nodenum of the node to remove from the device NodeDB");
+        AddArgument(nodeNumArgument);
 
-        this.SetHandler(async (context, commandContext) =>
+        this.SetHandler(async (nodeNum, context, commandContext) =>
             {
                 var handler = new RemoveNodeCommandHandler(nodeNum, context, commandContext);
                 await handler.Handle();
             },
+            nodeNumArgument,
             new DeviceConnectionBinder(port, host),
             new CommandContextBinder(log, output, dest, selectDest));
     }
diff --git a/Meshtastic.Cli/Properties/launchSettings.json b/Meshtastic.Cli/Properties/launchSettings.json
index d2818ee..239a27b 100644
--- a/Meshtastic.Cli/Properties/launchSettings.json
+++ b/Meshtastic.Cli/Properties/launchSettings.json
@@ -143,6 +143,10 @@
     "mqtt": {
       "commandName": "Project",
       "commandLineArgs": "mqtt-proxy"
+    },
+    "remove-node": {
+      "commandName": "Project",
+      "commandLineArgs": "remove-node 123456"
     }
   }
 }
diff --git a/Meshtastic/Data/MessageFactories/AdminMessageFactory.cs b/Meshtastic/Data/MessageFactories/AdminMessageFactory.cs
index 793007f..5e781e7 100644
--- a/Meshtastic/Data/MessageFactories/AdminMessageFactory.cs
+++ b/Meshtastic/Data/MessageFactories/AdminMessageFactory.cs
@@ -113,13 +113,13 @@ public MeshPacket CreateFactoryResetMessage()
     {
         return GetNewMeshPacket(new AdminMessage() { FactoryReset = 1 });
     }
-    public MeshPacket CreateRemoveByNodenumMessage(uint nodeNum)
+    public MeshPacket CreateNodeDbResetMessage()
     {
-        return GetNewMeshPacket(new AdminMessage() { RemoveByNodenum = nodeNum });
+        return GetNewMeshPacket(new AdminMessage() { NodedbReset = 1 });
     }
-    public MeshPacket CreateSetOwnerMessage()
+    public MeshPacket CreateRemoveByNodenumMessage(uint nodeNum)
     {
-        return GetNewMeshPacket(new AdminMessage() { SetOwner = container.MyNodeInfo });
+        return GetNewMeshPacket(new AdminMessage() { RemoveByNodenum = nodeNum });
     }
     public MeshPacket CreateSetCannedMessage(string message)
     {