diff --git a/hw/application_fpga/fw/mta1_mkdf_mem.h b/hw/application_fpga/fw/mta1_mkdf_mem.h
index 2a8b0c1..47463ef 100644
--- a/hw/application_fpga/fw/mta1_mkdf_mem.h
+++ b/hw/application_fpga/fw/mta1_mkdf_mem.h
@@ -37,17 +37,11 @@ enum {
     MTA1_MKDF_NAME1_SUFFIX   = 0x04,
     MTA1_MKDF_VERSION_SUFFIX = 0x08,
 
-    MTA1_MKDF_MMIO_TRNG_NAME0       = MTA1_MKDF_MMIO_TRNG_BASE | MTA1_MKDF_NAME0_SUFFIX,
-    MTA1_MKDF_MMIO_TRNG_NAME1       = MTA1_MKDF_MMIO_TRNG_BASE | MTA1_MKDF_NAME1_SUFFIX,
-    MTA1_MKDF_MMIO_TRNG_VERSION     = MTA1_MKDF_MMIO_TRNG_BASE | MTA1_MKDF_VERSION_SUFFIX,
     MTA1_MKDF_MMIO_TRNG_STATUS      = MTA1_MKDF_MMIO_TRNG_BASE | 0x24,
     MTA1_MKDF_MMIO_TRNG_STATUS_READY_BIT = 0,
     MTA1_MKDF_MMIO_TRNG_SAMPLE_RATE = MTA1_MKDF_MMIO_TRNG_BASE | 0x40,
     MTA1_MKDF_MMIO_TRNG_ENTROPY     = MTA1_MKDF_MMIO_TRNG_BASE | 0x80,
 
-    MTA1_MKDF_MMIO_TIMER_NAME0      = MTA1_MKDF_MMIO_TIMER_BASE | MTA1_MKDF_NAME0_SUFFIX,
-    MTA1_MKDF_MMIO_TIMER_NAME1      = MTA1_MKDF_MMIO_TIMER_BASE | MTA1_MKDF_NAME1_SUFFIX,
-    MTA1_MKDF_MMIO_TIMER_VERSION    = MTA1_MKDF_MMIO_TIMER_BASE | MTA1_MKDF_VERSION_SUFFIX,
     MTA1_MKDF_MMIO_TIMER_CTRL       = MTA1_MKDF_MMIO_TIMER_BASE | 0x20,
     MTA1_MKDF_MMIO_TIMER_CTRL_START_BIT = 0,
     MTA1_MKDF_MMIO_TIMER_CTRL_STOP_BIT  = 1,
@@ -56,15 +50,9 @@ enum {
     MTA1_MKDF_MMIO_TIMER_PRESCALER  = MTA1_MKDF_MMIO_TIMER_BASE | 0x28,
     MTA1_MKDF_MMIO_TIMER_TIMER      = MTA1_MKDF_MMIO_TIMER_BASE | 0x2c,
 
-    MTA1_MKDF_MMIO_UDS_NAME0        = MTA1_MKDF_MMIO_UDS_BASE | MTA1_MKDF_NAME0_SUFFIX,
-    MTA1_MKDF_MMIO_UDS_NAME1        = MTA1_MKDF_MMIO_UDS_BASE | MTA1_MKDF_NAME1_SUFFIX,
-    MTA1_MKDF_MMIO_UDS_VERSION      = MTA1_MKDF_MMIO_UDS_BASE | MTA1_MKDF_VERSION_SUFFIX,
     MTA1_MKDF_MMIO_UDS_FIRST        = MTA1_MKDF_MMIO_UDS_BASE | 0x40,
     MTA1_MKDF_MMIO_UDS_LAST         = MTA1_MKDF_MMIO_UDS_BASE | 0x5c, // Address of last 32-bit word of UDS
 
-    MTA1_MKDF_MMIO_UART_NAME0       = MTA1_MKDF_MMIO_UART_BASE | MTA1_MKDF_NAME0_SUFFIX,
-    MTA1_MKDF_MMIO_UART_NAME1       = MTA1_MKDF_MMIO_UART_BASE | MTA1_MKDF_NAME1_SUFFIX,
-    MTA1_MKDF_MMIO_UART_VERSION     = MTA1_MKDF_MMIO_UART_BASE | MTA1_MKDF_VERSION_SUFFIX,
     MTA1_MKDF_MMIO_UART_BIT_RATE    = MTA1_MKDF_MMIO_UART_BASE | 0x40,
     MTA1_MKDF_MMIO_UART_DATA_BITS   = MTA1_MKDF_MMIO_UART_BASE | 0x44,
     MTA1_MKDF_MMIO_UART_STOP_BITS   = MTA1_MKDF_MMIO_UART_BASE | 0x48,
@@ -73,9 +61,6 @@ enum {
     MTA1_MKDF_MMIO_UART_TX_STATUS   = MTA1_MKDF_MMIO_UART_BASE | 0x100,
     MTA1_MKDF_MMIO_UART_TX_DATA     = MTA1_MKDF_MMIO_UART_BASE | 0x104,
 
-    MTA1_MKDF_MMIO_TOUCH_NAME0      = MTA1_MKDF_MMIO_TOUCH_BASE | MTA1_MKDF_NAME0_SUFFIX,
-    MTA1_MKDF_MMIO_TOUCH_NAME1      = MTA1_MKDF_MMIO_TOUCH_BASE | MTA1_MKDF_NAME1_SUFFIX,
-    MTA1_MKDF_MMIO_TOUCH_VERSION    = MTA1_MKDF_MMIO_TOUCH_BASE | MTA1_MKDF_VERSION_SUFFIX,
     MTA1_MKDF_MMIO_TOUCH_STATUS     = MTA1_MKDF_MMIO_TOUCH_BASE | 0x24,
     MTA1_MKDF_MMIO_TOUCH_STATUS_EVENT_BIT = 0,