diff --git a/devices/stm32/stm32f0-30.xml b/devices/stm32/stm32f0-30.xml
index 6b5fda3d..f008ac2a 100644
--- a/devices/stm32/stm32f0-30.xml
+++ b/devices/stm32/stm32f0-30.xml
@@ -417,210 +417,6 @@
             <signal driver="usart" instance="6" name="rx"/>
           </request>
         </channel>
-        <channel position="6">
-          <request position="2">
-            <signal driver="i2c" instance="1" name="tx">
-              <remap position="27" mask="1" id="0"/>
-            </signal>
-          </request>
-          <request position="3">
-            <signal driver="spi" instance="2" name="rx"/>
-          </request>
-          <request position="4">
-            <signal driver="tim" instance="1" name="ch1"/>
-            <signal driver="tim" instance="1" name="ch2"/>
-            <signal driver="tim" instance="1" name="ch3">
-              <remap position="28" mask="1" id="0"/>
-            </signal>
-          </request>
-          <request position="6">
-            <signal driver="tim" instance="3" name="ch1">
-              <remap position="30" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="3" name="trig">
-              <remap position="30" mask="1" id="1"/>
-            </signal>
-          </request>
-          <request position="7">
-            <signal driver="tim" instance="16" name="ch1"/>
-            <signal driver="tim" instance="16" name="up"/>
-          </request>
-          <request position="8">
-            <signal driver="usart" instance="1" name="rx"/>
-          </request>
-          <request position="9">
-            <signal driver="usart" instance="2" name="rx"/>
-          </request>
-          <request position="10">
-            <signal driver="usart" instance="3" name="rx"/>
-          </request>
-          <request position="11">
-            <signal driver="usart" instance="4" name="rx"/>
-          </request>
-          <request position="12">
-            <signal driver="usart" instance="5" name="rx"/>
-          </request>
-          <request position="13">
-            <signal driver="usart" instance="6" name="rx"/>
-          </request>
-        </channel>
-        <channel position="7">
-          <request position="2">
-            <signal driver="i2c" instance="1" name="rx"/>
-          </request>
-          <request position="3">
-            <signal driver="spi" instance="2" name="tx"/>
-          </request>
-          <request position="7">
-            <signal driver="tim" instance="17" name="ch1">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="17" name="up">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
-          </request>
-          <request position="8">
-            <signal driver="usart" instance="1" name="tx"/>
-          </request>
-          <request position="9">
-            <signal driver="usart" instance="2" name="tx"/>
-          </request>
-          <request position="10">
-            <signal driver="usart" instance="3" name="tx"/>
-          </request>
-          <request position="11">
-            <signal driver="usart" instance="4" name="tx"/>
-          </request>
-          <request position="12">
-            <signal driver="usart" instance="5" name="tx"/>
-          </request>
-          <request position="13">
-            <signal driver="usart" instance="6" name="tx"/>
-          </request>
-        </channel>
-      </channels>
-      <channels instance="2">
-        <channel position="1">
-          <request position="2">
-            <signal driver="i2c" instance="2" name="tx"/>
-          </request>
-          <request position="8">
-            <signal driver="usart" instance="1" name="tx"/>
-          </request>
-          <request position="9">
-            <signal driver="usart" instance="2" name="tx"/>
-          </request>
-          <request position="10">
-            <signal driver="usart" instance="3" name="tx"/>
-          </request>
-          <request position="11">
-            <signal driver="usart" instance="4" name="tx"/>
-          </request>
-          <request position="12">
-            <signal driver="usart" instance="5" name="tx"/>
-          </request>
-          <request position="13">
-            <signal driver="usart" instance="6" name="tx"/>
-          </request>
-        </channel>
-        <channel position="2">
-          <request position="2">
-            <signal driver="i2c" instance="2" name="rx"/>
-          </request>
-          <request position="8">
-            <signal driver="usart" instance="1" name="rx"/>
-          </request>
-          <request position="9">
-            <signal driver="usart" instance="2" name="rx"/>
-          </request>
-          <request position="10">
-            <signal driver="usart" instance="3" name="rx"/>
-          </request>
-          <request position="11">
-            <signal driver="usart" instance="4" name="rx"/>
-          </request>
-          <request position="12">
-            <signal driver="usart" instance="5" name="rx"/>
-          </request>
-          <request position="13">
-            <signal driver="usart" instance="6" name="rx"/>
-          </request>
-        </channel>
-        <channel position="3">
-          <request position="1">
-            <signal driver="tim" instance="6" name="up"/>
-          </request>
-          <request position="3">
-            <signal driver="spi" instance="1" name="rx"/>
-          </request>
-          <request position="8">
-            <signal driver="usart" instance="1" name="rx"/>
-          </request>
-          <request position="9">
-            <signal driver="usart" instance="2" name="rx"/>
-          </request>
-          <request position="10">
-            <signal driver="usart" instance="3" name="rx"/>
-          </request>
-          <request position="11">
-            <signal driver="usart" instance="4" name="rx"/>
-          </request>
-          <request position="12">
-            <signal driver="usart" instance="5" name="rx"/>
-          </request>
-          <request position="13">
-            <signal driver="usart" instance="6" name="rx"/>
-          </request>
-        </channel>
-        <channel position="4">
-          <request position="1">
-            <signal driver="tim" instance="7" name="up"/>
-          </request>
-          <request position="3">
-            <signal driver="spi" instance="1" name="tx"/>
-          </request>
-          <request position="8">
-            <signal driver="usart" instance="1" name="tx"/>
-          </request>
-          <request position="9">
-            <signal driver="usart" instance="2" name="tx"/>
-          </request>
-          <request position="10">
-            <signal driver="usart" instance="3" name="tx"/>
-          </request>
-          <request position="11">
-            <signal driver="usart" instance="4" name="tx"/>
-          </request>
-          <request position="12">
-            <signal driver="usart" instance="5" name="tx"/>
-          </request>
-          <request position="13">
-            <signal driver="usart" instance="6" name="tx"/>
-          </request>
-        </channel>
-        <channel position="5">
-          <request position="1">
-            <signal driver="adc"/>
-          </request>
-          <request position="8">
-            <signal driver="usart" instance="1" name="tx"/>
-          </request>
-          <request position="9">
-            <signal driver="usart" instance="2" name="tx"/>
-          </request>
-          <request position="10">
-            <signal driver="usart" instance="3" name="tx"/>
-          </request>
-          <request position="11">
-            <signal driver="usart" instance="4" name="tx"/>
-          </request>
-          <request position="12">
-            <signal driver="usart" instance="5" name="tx"/>
-          </request>
-          <request position="13">
-            <signal driver="usart" instance="6" name="tx"/>
-          </request>
-        </channel>
       </channels>
     </driver>
     <driver name="gpio" type="stm32">
diff --git a/devices/stm32/stm32f0-70.xml b/devices/stm32/stm32f0-70.xml
index 2e7a8b7c..911065b3 100644
--- a/devices/stm32/stm32f0-70.xml
+++ b/devices/stm32/stm32f0-70.xml
@@ -200,7 +200,6 @@
           </signal>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
-          <signal device-size="b" driver="tim" instance="1" name="up"/>
           <signal device-size="b" driver="tim" instance="15" name="ch1"/>
           <signal device-size="b" driver="tim" instance="15" name="com"/>
           <signal device-size="b" driver="tim" instance="15" name="trig"/>
@@ -212,63 +211,6 @@
             <remap position="25" mask="1" id="0"/>
           </signal>
         </channel>
-        <channel device-size="b" position="6">
-          <signal driver="i2c" instance="1" name="tx">
-            <remap position="27" mask="1" id="1"/>
-          </signal>
-          <signal driver="spi" instance="2" name="rx">
-            <remap position="24" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="1" name="ch1">
-            <remap position="28" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="1" name="ch2">
-            <remap position="28" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="1" name="ch3">
-            <remap position="28" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="16" name="ch1">
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="16" name="up">
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="3" name="ch1">
-            <remap position="30" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="3" name="trig">
-            <remap position="30" mask="1" id="1"/>
-          </signal>
-          <signal driver="usart" instance="2" name="rx">
-            <remap position="25" mask="1" id="1"/>
-          </signal>
-          <signal driver="usart" instance="3" name="rx">
-            <remap position="26" mask="1" id="0"/>
-          </signal>
-          <signal driver="usart" instance="4" name="rx"/>
-        </channel>
-        <channel device-size="b" position="7">
-          <signal driver="i2c" instance="1" name="rx">
-            <remap position="27" mask="1" id="1"/>
-          </signal>
-          <signal driver="spi" instance="2" name="tx">
-            <remap position="24" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="17" name="ch1">
-            <remap position="14" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="17" name="up">
-            <remap position="14" mask="1" id="1"/>
-          </signal>
-          <signal driver="usart" instance="2" name="tx">
-            <remap position="25" mask="1" id="1"/>
-          </signal>
-          <signal driver="usart" instance="3" name="tx">
-            <remap position="26" mask="1" id="0"/>
-          </signal>
-          <signal driver="usart" instance="4" name="tx"/>
-        </channel>
       </channels>
     </driver>
     <driver name="gpio" type="stm32">
diff --git a/devices/stm32/stm32f0-71.xml b/devices/stm32/stm32f0-71.xml
index 530a4040..3cee67f8 100644
--- a/devices/stm32/stm32f0-71.xml
+++ b/devices/stm32/stm32f0-71.xml
@@ -237,7 +237,6 @@
           </signal>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
-          <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
           <signal driver="tim" instance="15" name="trig"/>
diff --git a/devices/stm32/stm32f0-72.xml b/devices/stm32/stm32f0-72.xml
index 31d3615a..d9dc1fb3 100644
--- a/devices/stm32/stm32f0-72.xml
+++ b/devices/stm32/stm32f0-72.xml
@@ -248,7 +248,6 @@
           </signal>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
-          <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
           <signal driver="tim" instance="15" name="trig"/>
diff --git a/devices/stm32/stm32f0-78.xml b/devices/stm32/stm32f0-78.xml
index 4b83954a..a0fd5778 100644
--- a/devices/stm32/stm32f0-78.xml
+++ b/devices/stm32/stm32f0-78.xml
@@ -231,7 +231,6 @@
           </signal>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
-          <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
           <signal driver="tim" instance="15" name="trig"/>
diff --git a/devices/stm32/stm32f1-00-4_6.xml b/devices/stm32/stm32f1-00-4_6.xml
index 51f44558..ae6e5f7f 100644
--- a/devices/stm32/stm32f1-00-4_6.xml
+++ b/devices/stm32/stm32f1-00-4_6.xml
@@ -144,7 +144,6 @@
           <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="16" name="ch1"/>
           <signal driver="tim" instance="16" name="up"/>
           <signal driver="tim" instance="3" name="ch1"/>
diff --git a/devices/stm32/stm32f1-00-8_b.xml b/devices/stm32/stm32f1-00-8_b.xml
index 2d3328a0..01715e37 100644
--- a/devices/stm32/stm32f1-00-8_b.xml
+++ b/devices/stm32/stm32f1-00-8_b.xml
@@ -159,7 +159,6 @@
           <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="16" name="ch1"/>
           <signal driver="tim" instance="16" name="up"/>
           <signal driver="tim" instance="3" name="ch1"/>
diff --git a/devices/stm32/stm32f1-00-c_d_e.xml b/devices/stm32/stm32f1-00-c_d_e.xml
index 9ff54915..812490ea 100644
--- a/devices/stm32/stm32f1-00-c_d_e.xml
+++ b/devices/stm32/stm32f1-00-c_d_e.xml
@@ -179,7 +179,6 @@
           <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="16" name="ch1"/>
           <signal driver="tim" instance="16" name="up"/>
           <signal driver="tim" instance="3" name="ch1"/>
diff --git a/devices/stm32/stm32f3-73_78.xml b/devices/stm32/stm32f3-73_78.xml
index b23f8e97..bffac061 100644
--- a/devices/stm32/stm32f3-73_78.xml
+++ b/devices/stm32/stm32f3-73_78.xml
@@ -277,12 +277,6 @@
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
           </signal>
-          <signal driver="tim" instance="17" name="ch1">
-            <remap position="12" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="17" name="up">
-            <remap position="12" mask="1" id="1"/>
-          </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="1"/>
           </signal>
diff --git a/tools/generator/dfg/stm32/stm_device_tree.py b/tools/generator/dfg/stm32/stm_device_tree.py
index 379b28c2..c2095fec 100644
--- a/tools/generator/dfg/stm32/stm_device_tree.py
+++ b/tools/generator/dfg/stm32/stm_device_tree.py
@@ -324,6 +324,26 @@ def rv(param, default=[]):
                 # print(instance, stream, channel)
                 # print(signal)
 
+        # Manually handle condition expressions from XML for
+        # (STM32F030CCTx|STM32F030RCTx) and (STM32F070CBTx|STM32F070RBTx)
+        if did.family in ['f0']:
+            if (did.name == '30' and did.size == 'c'):
+                dma_streams['1'].pop('6')
+                dma_streams['1'].pop('7')
+                dma_streams.pop('2')
+            if (did.name == '70' and did.size == 'b'):
+                dma_streams['1'].pop('6')
+                dma_streams['1'].pop('7')
+
+        # De-duplicate DMA signal entries
+        def deduplicate_list(l):
+            return [i for n, i in enumerate(l) if i not in l[n + 1:]]
+        for stream in dma_streams:
+            for channel in dma_streams[stream]:
+                for signal in dma_streams[stream][channel]:
+                    dma_streams[stream][channel][signal] = deduplicate_list(
+                        dma_streams[stream][channel][signal])
+
         # if p["dma_naming"][1] == "request":
         #     print(did, dmaFile.filename)
         p["dma"] = dma_streams