diff --git a/deviceonly.proto b/deviceonly.proto
index 62263d1..e24b334 100644
--- a/deviceonly.proto
+++ b/deviceonly.proto
@@ -42,11 +42,6 @@ message DeviceState {
    */
   repeated MeshPacket receive_queue = 5;
 
-  /*
-   * Group Info
-   */
-  GroupInfo group_info = 6;
-
   /*
    * A version integer used to invalidate old save files when we make
    * incompatible changes This integer is set at build time and is private to
diff --git a/mesh.proto b/mesh.proto
index 8508e78..93999cf 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -525,12 +525,6 @@ message Data {
    * a message a heart or poop emoji.
    */
   bool is_tapback = 8;
-
-  /*
-   * Defaults to false. If true, then what is in the payload should be treated as an emoji like giving
-   * a message a heart or poop emoji.
-   */
-   uint32 group_id = 9;
 }
 
 /*
@@ -887,14 +881,6 @@ enum CriticalErrorCode {
   RadioSpiBug = 11;
 }
 
-/*
- * GroupInfo for group chats like #FoodFreaks and #CoolPeopleOnly
- */
-message GroupInfo {
-  repeated string group = 1;
-}
-
-
 /*
  * Unique local debugging info for this node
  * Note: we don't include position or the user info, because that will come in the
@@ -1116,10 +1102,6 @@ message FromRadio {
      */
     bool rebooted = 9;
 
-    /*
-     * Groups
-     */
-    GroupInfo groups = 12;
   }
 }
 
diff --git a/portnums.proto b/portnums.proto
index 70509f1..3da81f9 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -92,9 +92,9 @@ enum PortNum {
   IP_TUNNEL_APP = 33;
 
   /*
-   * Used for managing chat groups
+   * Used for the router plugin
    */
-  GROUP_APP = 34;
+  ROUTER_APP = 34;
 
    /*
    * Provides a hardware serial interface to send and receive from the Meshtastic network.