diff --git a/src/components/Dialog/NodeDetailsDialog/NodeDetailsDialog.tsx b/src/components/Dialog/NodeDetailsDialog/NodeDetailsDialog.tsx
index 9510a4bb..8ef40238 100644
--- a/src/components/Dialog/NodeDetailsDialog/NodeDetailsDialog.tsx
+++ b/src/components/Dialog/NodeDetailsDialog/NodeDetailsDialog.tsx
@@ -31,7 +31,6 @@ import {
   DialogTitle,
 } from "@components/UI/Dialog.tsx";
 import { Button } from "@components/UI/Button.tsx";
-
 import {
   BellIcon,
   BellOffIcon,
@@ -64,8 +63,10 @@ export const NodeDetailsDialog = ({
   const { setDialogOpen, connection, setActivePage } = useDevice();
   const { setNodeNumToBeRemoved } = useAppStore();
   const { setChatType, setActiveChat } = useMessageStore();
+
   const { updateFavorite } = useUpdateFavorite();
   const [isFavoriteState, setIsFavoriteState] = useState<boolean>(false);
+
   const { updateIgnored } = useUpdateIgnored();
   const [isIgnoredState, setIsIgnoredState] = useState<boolean>(false);
 
@@ -251,7 +252,8 @@ export const NodeDetailsDialog = ({
                   </p>
                   <p>
                     Hardware:{" "}
-                    {Protobuf.Mesh.HardwareModel[node.user?.hwModel ?? 0]
+                    {(Protobuf.Mesh.HardwareModel[node.user?.hwModel ?? 0] ??
+                      "Unknown")
                       .replace(/_/g, " ")}
                   </p>
                 </div>
diff --git a/src/components/Dialog/NodeOptionsDialog.tsx b/src/components/Dialog/NodeOptionsDialog.tsx
deleted file mode 100644
index 04809134..00000000
--- a/src/components/Dialog/NodeOptionsDialog.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { toast } from "../../core/hooks/useToast.ts";
-import { useAppStore } from "../../core/stores/appStore.ts";
-import { useDevice } from "../../core/stores/deviceStore.ts";
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "../UI/Dialog.tsx";
-import type { Protobuf } from "@meshtastic/core";
-import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
-import { TrashIcon } from "lucide-react";
-
-import { Button } from "../UI/Button.tsx";
-import {
-  MessageType,
-  useMessageStore,
-} from "../../core/stores/messageStore/index.ts";
-
-export interface NodeOptionsDialogProps {
-  node: Protobuf.Mesh.NodeInfo | undefined;
-  open: boolean;
-  onOpenChange: () => void;
-}
-
-export const NodeOptionsDialog = ({
-  node,
-  open,
-  onOpenChange,
-}: NodeOptionsDialogProps) => {
-  const { setDialogOpen, connection, setActivePage } = useDevice();
-  const {
-    setNodeNumToBeRemoved,
-    setNodeNumDetails,
-  } = useAppStore();
-  const { setChatType, setActiveChat } = useMessageStore();
-
-  if (!node) return null;
-
-  const longName = node?.user?.longName ??
-    (node ? `!${numberToHexUnpadded(node?.num)}` : "Unknown");
-  const shortName = node?.user?.shortName ??
-    (node ? `${numberToHexUnpadded(node?.num).substring(0, 4)}` : "UNK");
-
-  function handleDirectMessage() {
-    setChatType(MessageType.Direct);
-    setActiveChat(node.num);
-    setActivePage("messages");
-  }
-
-  function handleRequestPosition() {
-    toast({
-      title: "Requesting position, please wait...",
-    });
-    connection?.requestPosition(node.num).then(() =>
-      toast({
-        title: "Position request sent.",
-      })
-    );
-    onOpenChange();
-  }
-
-  function handleTraceroute() {
-    toast({
-      title: "Sending Traceroute, please wait...",
-    });
-    connection?.traceRoute(node.num).then(() =>
-      toast({
-        title: "Traceroute sent.",
-      })
-    );
-    onOpenChange();
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent aria-describedby={undefined}>
-        <DialogClose />
-        <DialogHeader>
-          <DialogTitle>{`${longName} (${shortName})`}</DialogTitle>
-        </DialogHeader>
-        <div className="flex flex-col space-y-1">
-          <div>
-            <Button onClick={handleDirectMessage}>Direct Message</Button>
-          </div>
-          <div>
-            <Button onClick={handleRequestPosition}>Request Position</Button>
-          </div>
-          <div>
-            <Button onClick={handleTraceroute}>Trace Route</Button>
-          </div>
-          <div>
-            <Button
-              key="remove"
-              variant="destructive"
-              onClick={() => {
-                setNodeNumToBeRemoved(node?.num);
-                setDialogOpen("nodeRemoval", true);
-              }}
-            >
-              <TrashIcon />
-              Remove
-            </Button>
-          </div>
-          <div>
-            <Button
-              onClick={() => {
-                setNodeNumDetails(node?.num);
-                setDialogOpen("nodeDetails", true);
-              }}
-            >
-              More Details
-            </Button>
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-};