diff --git a/meshtastic/deviceonly.options b/meshtastic/deviceonly.options
index aa33cc2..fe51ce9 100644
--- a/meshtastic/deviceonly.options
+++ b/meshtastic/deviceonly.options
@@ -2,12 +2,7 @@
 # https://jpa.kapsi.fi/nanopb/docs/reference.html#proto-file-options
 
 # FIXME pick a higher number someday? or do dynamic alloc in nanopb?
-# As of April 2023, the size of a NodeInfo packet is approx. 130 bytes. We previously
-# capped storage at 80 such packets. The size of a Neighbor is 12 bytes, meaning we can fit
-# 10 for every NodeInfo. Thus, our footprint for storing 20 Neighbors in the DB is a little under
-# 2 NodeInfo.
-*DeviceState.node_db max_count:78
-*DeviceState.node_db_neighbors max_count:20
+*DeviceState.node_db max_count:80
 
 # FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in RAM
 *DeviceState.receive_queue max_count:1
diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index d8456cf..d798013 100644
--- a/meshtastic/deviceonly.proto
+++ b/meshtastic/deviceonly.proto
@@ -65,13 +65,6 @@ message DeviceState {
    * Some GPS receivers seem to have bogus settings from the factory, so we always do one factory reset.
    */
   bool did_gps_reset = 11;
-
-  /*
-   * Sender information used by NeighborInfo Module to get edge info on the mesh.
-   * This is stored in each node's nodeDB so we'll have a SNR per edge when we sniff packets.
-   * This field should disabled (always zeroed) unless user opts in.
-   */
-  repeated Neighbor node_db_neighbors = 12;
 }
 
 /*
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 9a2ccdb..eadc0a6 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1400,14 +1400,9 @@ message NeighborInfo {
   */
   uint32 last_sent_by_id = 2;
   /*
-  * Time at packet transmission (in millis, Unix epoch)
+  * The list of out edges from this node
   */
-  fixed32 tx_time = 3;
-
-  /*
-  * The list of neighbors
-  */
-  repeated Neighbor neighbors = 4;
+  repeated Neighbor neighbors = 3;
 }
 
 /*
@@ -1423,11 +1418,6 @@ message Neighbor {
   * SNR of last heard message
   */
   float snr = 2;
-
-  /*
-  * Time of last heard message (in millis, Unix epoch)
-  */
-  fixed32 rx_time = 3;
 }
 
 /*