diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/gen_soclabs_4x7_AhbMatrix.scr b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/gen_soclabs_4x7_AhbMatrix.scr
index 3be03d724a83977dbd28a467a36acbea27c04aab..a4d2556a2ac45249fb037110a2a7b4e860c5be0b 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/gen_soclabs_4x7_AhbMatrix.scr
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/gen_soclabs_4x7_AhbMatrix.scr
@@ -1,2 +1,2 @@
-bin/BuildBusMatrix.pl -xmldir xml -cfg soclabs_ahb32_4x7.xml -ipxact -ipxactsrcdir=ipxact/src -ipxacttgtdir=ipxact/built -over -verbose >& soclabs_ahb32_4x7.log
+bin/BuildBusMatrix.pl  -notimescales -xmldir xml -cfg soclabs_ahb32_4x7.xml -ipxact -ipxactsrcdir=ipxact/src -ipxacttgtdir=ipxact/built -over -verbose >& soclabs_ahb32_4x7.log
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/ipxact/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix.xml b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/ipxact/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix.xml
index ccf604e836286f2121735615a00e0ecef87c3ff2..bc1effeef0b83d77b5ad81f423a321f5367a676f 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/ipxact/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix.xml
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/ipxact/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix.xml
@@ -1974,17 +1974,17 @@
    <spirit:remapStates>
 
       <spirit:remapState>
-          <spirit:name>remap_0</spirit:name>
-          <spirit:description>Remap state remap_0</spirit:description>
+          <spirit:name>remap_n0</spirit:name>
+          <spirit:description>Remap state remap_n0</spirit:description>
           <spirit:remapPorts>
-             <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">1</spirit:remapPort>
+             <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">0</spirit:remapPort>
           </spirit:remapPorts>
       </spirit:remapState>
       <spirit:remapState>
-          <spirit:name>remap_n0</spirit:name>
-          <spirit:description>Remap state remap_n0</spirit:description>
+          <spirit:name>remap_0</spirit:name>
+          <spirit:description>Remap state remap_0</spirit:description>
           <spirit:remapPorts>
-             <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">0</spirit:remapPort>
+             <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">1</spirit:remapPort>
           </spirit:remapPorts>
       </spirit:remapState>
 
@@ -2188,17 +2188,6 @@
             <spirit:baseAddress>0xf0000000</spirit:baseAddress>
          </spirit:subspaceMap>
 
-         <spirit:memoryRemap spirit:state="remap_0">
-            <spirit:name>AHBLiteTarget_Slave__adp_remap_0_remap_MM</spirit:name>
-            <spirit:description>_adp remap_0 remap</spirit:description>
-            <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__ram2"
-                                spirit:segmentRef="_ram2_0x00000000_0x0fffffff">
-               <!-- Remapped region, active when REMAP bitcombination is 0 address_region 0x00000000-0x0fffffff -->
-               <spirit:name>AHBLiteTarget_Master__ram2_0x00000000_0_state_remap_0_SM</spirit:name>
-               <spirit:baseAddress>0x00000000</spirit:baseAddress>
-            </spirit:subspaceMap>
-         </spirit:memoryRemap>
-
          <spirit:memoryRemap spirit:state="remap_n0">
             <spirit:name>AHBLiteTarget_Slave__adp_remap_n0_remap_MM</spirit:name>
             <spirit:description>_adp remap_n0 remap</spirit:description>
@@ -2210,6 +2199,17 @@
             </spirit:subspaceMap>
          </spirit:memoryRemap>
 
+         <spirit:memoryRemap spirit:state="remap_0">
+            <spirit:name>AHBLiteTarget_Slave__adp_remap_0_remap_MM</spirit:name>
+            <spirit:description>_adp remap_0 remap</spirit:description>
+            <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__ram2"
+                                spirit:segmentRef="_ram2_0x00000000_0x0fffffff">
+               <!-- Remapped region, active when REMAP bitcombination is 0 address_region 0x00000000-0x0fffffff -->
+               <spirit:name>AHBLiteTarget_Master__ram2_0x00000000_0_state_remap_0_SM</spirit:name>
+               <spirit:baseAddress>0x00000000</spirit:baseAddress>
+            </spirit:subspaceMap>
+         </spirit:memoryRemap>
+
       </spirit:memoryMap>
 
       <spirit:memoryMap>
@@ -2417,17 +2417,6 @@
             <spirit:baseAddress>0xf0000000</spirit:baseAddress>
          </spirit:subspaceMap>
 
-         <spirit:memoryRemap spirit:state="remap_0">
-            <spirit:name>AHBLiteTarget_Slave__cpu_remap_0_remap_MM</spirit:name>
-            <spirit:description>_cpu remap_0 remap</spirit:description>
-            <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__ram2"
-                                spirit:segmentRef="_ram2_0x00000000_0x0fffffff">
-               <!-- Remapped region, active when REMAP bitcombination is 0 address_region 0x00000000-0x0fffffff -->
-               <spirit:name>AHBLiteTarget_Master__ram2_0x00000000_0_state_remap_0_SM</spirit:name>
-               <spirit:baseAddress>0x00000000</spirit:baseAddress>
-            </spirit:subspaceMap>
-         </spirit:memoryRemap>
-
          <spirit:memoryRemap spirit:state="remap_n0">
             <spirit:name>AHBLiteTarget_Slave__cpu_remap_n0_remap_MM</spirit:name>
             <spirit:description>_cpu remap_n0 remap</spirit:description>
@@ -2439,6 +2428,17 @@
             </spirit:subspaceMap>
          </spirit:memoryRemap>
 
+         <spirit:memoryRemap spirit:state="remap_0">
+            <spirit:name>AHBLiteTarget_Slave__cpu_remap_0_remap_MM</spirit:name>
+            <spirit:description>_cpu remap_0 remap</spirit:description>
+            <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__ram2"
+                                spirit:segmentRef="_ram2_0x00000000_0x0fffffff">
+               <!-- Remapped region, active when REMAP bitcombination is 0 address_region 0x00000000-0x0fffffff -->
+               <spirit:name>AHBLiteTarget_Master__ram2_0x00000000_0_state_remap_0_SM</spirit:name>
+               <spirit:baseAddress>0x00000000</spirit:baseAddress>
+            </spirit:subspaceMap>
+         </spirit:memoryRemap>
+
       </spirit:memoryMap>
 
    </spirit:memoryMaps>
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/ipxact/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_lite.xml b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/ipxact/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_lite.xml
index 787baebc5ddfaf0707bde7aea78e3523bd60a121..2adfad5181430e5145d5298b536ec99cdd73ba08 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/ipxact/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_lite.xml
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/ipxact/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_lite.xml
@@ -1833,17 +1833,17 @@
    <spirit:remapStates>
 
       <spirit:remapState>
-          <spirit:name>remap_0</spirit:name>
-          <spirit:description>Remap state remap_0</spirit:description>
+          <spirit:name>remap_n0</spirit:name>
+          <spirit:description>Remap state remap_n0</spirit:description>
           <spirit:remapPorts>
-             <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">1</spirit:remapPort>
+             <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">0</spirit:remapPort>
           </spirit:remapPorts>
       </spirit:remapState>
       <spirit:remapState>
-          <spirit:name>remap_n0</spirit:name>
-          <spirit:description>Remap state remap_n0</spirit:description>
+          <spirit:name>remap_0</spirit:name>
+          <spirit:description>Remap state remap_0</spirit:description>
           <spirit:remapPorts>
-             <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">0</spirit:remapPort>
+             <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">1</spirit:remapPort>
           </spirit:remapPorts>
       </spirit:remapState>
 
@@ -2047,17 +2047,6 @@
             <spirit:baseAddress>0xf0000000</spirit:baseAddress>
          </spirit:subspaceMap>
 
-         <spirit:memoryRemap spirit:state="remap_0">
-            <spirit:name>AHBLiteInitiator_Slave__adp_remap_0_remap_MM</spirit:name>
-            <spirit:description>_adp remap_0 remap</spirit:description>
-            <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__ram2"
-                                spirit:segmentRef="_ram2_0x00000000_0x0fffffff">
-               <!-- Remapped region, active when REMAP bitcombination is 0 address_region 0x00000000-0x0fffffff -->
-               <spirit:name>AHBLiteTarget_Master__ram2_0x00000000_0_state_remap_0_SM</spirit:name>
-               <spirit:baseAddress>0x00000000</spirit:baseAddress>
-            </spirit:subspaceMap>
-         </spirit:memoryRemap>
-
          <spirit:memoryRemap spirit:state="remap_n0">
             <spirit:name>AHBLiteInitiator_Slave__adp_remap_n0_remap_MM</spirit:name>
             <spirit:description>_adp remap_n0 remap</spirit:description>
@@ -2069,6 +2058,17 @@
             </spirit:subspaceMap>
          </spirit:memoryRemap>
 
+         <spirit:memoryRemap spirit:state="remap_0">
+            <spirit:name>AHBLiteInitiator_Slave__adp_remap_0_remap_MM</spirit:name>
+            <spirit:description>_adp remap_0 remap</spirit:description>
+            <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__ram2"
+                                spirit:segmentRef="_ram2_0x00000000_0x0fffffff">
+               <!-- Remapped region, active when REMAP bitcombination is 0 address_region 0x00000000-0x0fffffff -->
+               <spirit:name>AHBLiteTarget_Master__ram2_0x00000000_0_state_remap_0_SM</spirit:name>
+               <spirit:baseAddress>0x00000000</spirit:baseAddress>
+            </spirit:subspaceMap>
+         </spirit:memoryRemap>
+
       </spirit:memoryMap>
 
       <spirit:memoryMap>
@@ -2276,17 +2276,6 @@
             <spirit:baseAddress>0xf0000000</spirit:baseAddress>
          </spirit:subspaceMap>
 
-         <spirit:memoryRemap spirit:state="remap_0">
-            <spirit:name>AHBLiteInitiator_Slave__cpu_remap_0_remap_MM</spirit:name>
-            <spirit:description>_cpu remap_0 remap</spirit:description>
-            <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__ram2"
-                                spirit:segmentRef="_ram2_0x00000000_0x0fffffff">
-               <!-- Remapped region, active when REMAP bitcombination is 0 address_region 0x00000000-0x0fffffff -->
-               <spirit:name>AHBLiteTarget_Master__ram2_0x00000000_0_state_remap_0_SM</spirit:name>
-               <spirit:baseAddress>0x00000000</spirit:baseAddress>
-            </spirit:subspaceMap>
-         </spirit:memoryRemap>
-
          <spirit:memoryRemap spirit:state="remap_n0">
             <spirit:name>AHBLiteInitiator_Slave__cpu_remap_n0_remap_MM</spirit:name>
             <spirit:description>_cpu remap_n0 remap</spirit:description>
@@ -2298,6 +2287,17 @@
             </spirit:subspaceMap>
          </spirit:memoryRemap>
 
+         <spirit:memoryRemap spirit:state="remap_0">
+            <spirit:name>AHBLiteInitiator_Slave__cpu_remap_0_remap_MM</spirit:name>
+            <spirit:description>_cpu remap_0 remap</spirit:description>
+            <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__ram2"
+                                spirit:segmentRef="_ram2_0x00000000_0x0fffffff">
+               <!-- Remapped region, active when REMAP bitcombination is 0 address_region 0x00000000-0x0fffffff -->
+               <spirit:name>AHBLiteTarget_Master__ram2_0x00000000_0_state_remap_0_SM</spirit:name>
+               <spirit:baseAddress>0x00000000</spirit:baseAddress>
+            </spirit:subspaceMap>
+         </spirit:memoryRemap>
+
       </spirit:memoryMap>
 
    </spirit:memoryMaps>
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix.v
index f08683229a182ee231c8fbbbbf7ebcb6cf19f758..6179e6075f7fc9e1b45fa9c32e09dfccb8fc2853 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix.v
@@ -42,8 +42,6 @@
 //------------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_AhbMatrix (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_default_slave.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_default_slave.v
index 8f241850ebb4fba1340ebbbc967f40c39e0e3a64..156124e9f5ae70c06a0d4ef9e0517603eb826211 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_default_slave.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_default_slave.v
@@ -27,8 +27,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_AhbMatrix_default_slave (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_lite.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_lite.v
index bd81ad5d8ac258c05fc09aac4d571a8d90e97eae..f17138d10ed6515f84e2451985c6bc13832a8cc1 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_lite.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_AhbMatrix_lite.v
@@ -29,8 +29,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_AhbMatrix_lite (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_Arbiter.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_Arbiter.v
index f5eb286e8a5de73ef740ef8d4985c467c7791a06..062079a2940b40ecfb6c7b5e3a45279e1eefe13b 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_Arbiter.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_Arbiter.v
@@ -31,8 +31,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_Arbiter (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MasterInput.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MasterInput.v
index c7ff01a0248933069f675602eea6a6edcb245cfe..4e083b9add91ea2addc9fa0c12d7bdec835ce4a4 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MasterInput.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MasterInput.v
@@ -28,8 +28,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_MasterInput (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_adp.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_adp.v
index dad3668a66c9b50da68807874c39ffdb45ce25fd..50a072540d7df984c5cd5294fef055359c1e804d 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_adp.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_adp.v
@@ -32,8 +32,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_MatrixDecode_adp (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_cpu.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_cpu.v
index 9e2b72d04a99cc3de014dbb458c5ec5d2cb0a676..bd40d1edc936f6ad218fcb41f04a09a4271bb219 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_cpu.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_cpu.v
@@ -32,8 +32,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_MatrixDecode_cpu (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_dma.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_dma.v
index 30b9ada8a2cf5e13140351b33ed80740fecc1a13..0f0e1e24575d2a3abbcd2fa3499f971eaf865eb5 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_dma.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_dma.v
@@ -32,8 +32,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_MatrixDecode_dma (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_dma2.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_dma2.v
index d80c2801cf81512c7e5bf257d9baac108dc80f70..a0acb7f6c15252af9c4f4dd14b4cc8b4d5b2e9db 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_dma2.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_MatrixDecode_dma2.v
@@ -32,8 +32,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_MatrixDecode_dma2 (
 
diff --git a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_SlaveOutput.v b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_SlaveOutput.v
index 98779fd6181c35f359350871b613f1828663fb59..a572d454ab493202d99c3edc4c46ed67f9373041 100644
--- a/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_SlaveOutput.v
+++ b/Cortex-M0/nanosoc/systems/mcu/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix/soclabs_4x7_SlaveOutput.v
@@ -31,8 +31,6 @@
 //-----------------------------------------------------------------------------
 
 
-`timescale 1ns/1ps
-
 
 module soclabs_4x7_SlaveOutput (