diff --git a/avr/devices/c01/aqua_c01.xml b/avr/devices/c01/aqua_c01.xml
index 6181e0c..4114850 100644
--- a/avr/devices/c01/aqua_c01.xml
+++ b/avr/devices/c01/aqua_c01.xml
@@ -7,18 +7,6 @@
   <values>
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="stats_heap_used"        id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_heap_free"        id="0xe8" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_noram_errors"     id="0xe9" type="sensor" dataType="uint16" denom="1" />
-
   </values>
 
 </device>
diff --git a/avr/devices/c02/aqua_c02.xml b/avr/devices/c02/aqua_c02.xml
index 521b5d0..bb9caa6 100644
--- a/avr/devices/c02/aqua_c02.xml
+++ b/avr/devices/c02/aqua_c02.xml
@@ -7,18 +7,6 @@
   <values>
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="stats_heap_used"        id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_heap_free"        id="0xe8" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_noram_errors"     id="0xe9" type="sensor" dataType="uint16" denom="1" />
-
   </values>
 
 </device>
diff --git a/avr/devices/n14/aqua_n14.xml b/avr/devices/n14/aqua_n14.xml
index c74f8df..b59ccfa 100644
--- a/avr/devices/n14/aqua_n14.xml
+++ b/avr/devices/n14/aqua_n14.xml
@@ -15,14 +15,6 @@
     <value name="MALSOURCE1"   id="0x86" type="actor"  dataType="uint16" />
     <value name="MALSOURCE2"   id="0x87" type="actor"  dataType="uint16" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
   </values>
 
diff --git a/avr/devices/n21/aqua_n21.xml b/avr/devices/n21/aqua_n21.xml
index 5a59b8c..f3ff989 100644
--- a/avr/devices/n21/aqua_n21.xml
+++ b/avr/devices/n21/aqua_n21.xml
@@ -11,14 +11,6 @@
     <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
     <value name="DOOR"         id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
   </values>
 
diff --git a/avr/devices/n24/aqua_n24.xml b/avr/devices/n24/aqua_n24.xml
index 6cee19c..489d1a1 100644
--- a/avr/devices/n24/aqua_n24.xml
+++ b/avr/devices/n24/aqua_n24.xml
@@ -13,16 +13,6 @@
     <value name="SGP30_CO2"              id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
     <value name="LIGHT"                  id="0x0b" type="sensor" dataType="rational" modality="light"                 denom="1" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
diff --git a/avr/devices/n25/aqua_n25.xml b/avr/devices/n25/aqua_n25.xml
index 470ff46..87b925a 100644
--- a/avr/devices/n25/aqua_n25.xml
+++ b/avr/devices/n25/aqua_n25.xml
@@ -15,16 +15,6 @@
     <value name="MALSOURCE1"             id="0x86" type="actor"  dataType="uint16" />
     <value name="MALSOURCE2"             id="0x87" type="actor"  dataType="uint16" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
diff --git a/avr/devices/n26/aqua_n26.xml b/avr/devices/n26/aqua_n26.xml
index 33515b5..c163295 100644
--- a/avr/devices/n26/aqua_n26.xml
+++ b/avr/devices/n26/aqua_n26.xml
@@ -8,16 +8,6 @@
     <value name="SGP30_TVOC"             id="0x09" type="sensor" dataType="rational" modality="tvoc"  denom="1" />
     <value name="SGP30_CO2"              id="0x0a" type="sensor" dataType="rational" modality="co2"   denom="1" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
   </values>
 
diff --git a/avr/devices/n27/aqua_n27.xml b/avr/devices/n27/aqua_n27.xml
index 26b7ef5..5ec46d0 100644
--- a/avr/devices/n27/aqua_n27.xml
+++ b/avr/devices/n27/aqua_n27.xml
@@ -8,21 +8,8 @@
     <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
     <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
     <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
-    <value name="SGP40_VALUE"            id="0x08" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_TVOC"             id="0x09" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_CO2"              id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
     <value name="LIGHT"                  id="0x0b" type="sensor" dataType="rational" modality="light"                 denom="1" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
diff --git a/avr/devices/r05/aqua_r05.xml b/avr/devices/r05/aqua_r05.xml
index 3e7ac14..f03902f 100644
--- a/avr/devices/r05/aqua_r05.xml
+++ b/avr/devices/r05/aqua_r05.xml
@@ -7,26 +7,6 @@
   <values>
     <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
 
-    <value name="stats_packets_in"        id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"       id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"    id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"         id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"      id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors"  id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"       id="0xe6" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors"    id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors"     id="0xe8" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="stats_packets_in2"       id="0xe9" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out2"      id="0xea" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors2"   id="0xeb" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors2"        id="0xec" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors2"     id="0xed" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors2" id="0xee" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors2"      id="0xef" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors2"   id="0xf0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors2"    id="0xf1" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"               id="0x88" type="actor"  dataType="uint16" />
     <value name="addressRange"            id="0x89" type="actor"  dataType="uint16" />
   </values>
diff --git a/avr/devices/r06/aqua_r06.xml b/avr/devices/r06/aqua_r06.xml
index f0fc612..212b756 100644
--- a/avr/devices/r06/aqua_r06.xml
+++ b/avr/devices/r06/aqua_r06.xml
@@ -5,16 +5,7 @@
   <deviceversion>6</deviceversion>
   
   <values>
-
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
+    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
   </values>
 
 </device>