diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto
index 901ce7db..675ac134 100644
--- a/meshtastic/admin.proto
+++ b/meshtastic/admin.proto
@@ -5,7 +5,6 @@ package meshtastic;
 import "meshtastic/channel.proto";
 import "meshtastic/config.proto";
 import "meshtastic/connection_status.proto";
-import "meshtastic/deviceonly.proto";
 import "meshtastic/mesh.proto";
 import "meshtastic/module_config.proto";
 
diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index f5345c9d..d2daf31c 100644
--- a/meshtastic/deviceonly.proto
+++ b/meshtastic/deviceonly.proto
@@ -254,18 +254,3 @@ message OEMStore {
    */
   LocalModuleConfig oem_local_module_config = 8;
 }
-
-/*
- * RemoteHardwarePins associated with a node
- */
-message NodeRemoteHardwarePin {
-  /*
-   * The node_num exposing the available gpio pin
-   */
-  uint32 node_num = 1;
-
-  /*
-   * The the available gpio pin for usage with RemoteHardware module
-   */
-  RemoteHardwarePin pin = 2;
-}
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 60a39061..605c6817 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1581,3 +1581,18 @@ message DeviceMetadata {
 message Heartbeat {
   
 }
+
+/*
+ * RemoteHardwarePins associated with a node
+ */
+message NodeRemoteHardwarePin {
+  /*
+   * The node_num exposing the available gpio pin
+   */
+  uint32 node_num = 1;
+
+  /*
+   * The the available gpio pin for usage with RemoteHardware module
+   */
+  RemoteHardwarePin pin = 2;
+}