diff --git a/applications/compaan/designs/compaan_unb1_10g_bg_db/src/vhdl/mmm_compaan_unb1_10g_bg_db.vhd b/applications/compaan/designs/compaan_unb1_10g_bg_db/src/vhdl/mmm_compaan_unb1_10g_bg_db.vhd
index 23bc8e7c306b1b80f6ef55da54be46819b9bcbb9..2d992a44751755b5c31ad26360cbd04fa69cee7d 100644
--- a/applications/compaan/designs/compaan_unb1_10g_bg_db/src/vhdl/mmm_compaan_unb1_10g_bg_db.vhd
+++ b/applications/compaan/designs/compaan_unb1_10g_bg_db/src/vhdl/mmm_compaan_unb1_10g_bg_db.vhd
@@ -47,10 +47,6 @@
 --     eth1g_reg_miso                 =>  eth1g_reg_miso,
 --     eth1g_tse_mosi                 =>  eth1g_tse_mosi,
 --     eth1g_tse_miso                 =>  eth1g_tse_miso,
---     reg_epcs_mosi                  =>  reg_epcs_mosi,
---     reg_epcs_miso                  =>  reg_epcs_miso,
---     reg_remu_mosi                  =>  reg_remu_mosi,
---     reg_remu_miso                  =>  reg_remu_miso,
 --     reg_bsn_monitor_mosi           =>  reg_bsn_monitor_mosi,
 --     reg_bsn_monitor_miso           =>  reg_bsn_monitor_miso,
 --     reg_dp_offload_tx_mosi         =>  reg_dp_offload_tx_mosi,
@@ -97,10 +93,6 @@
 -- SIGNAL eth1g_reg_miso                 : t_mem_miso;
 -- SIGNAL eth1g_tse_mosi                 : t_mem_mosi;
 -- SIGNAL eth1g_tse_miso                 : t_mem_miso;
--- SIGNAL reg_epcs_mosi                  : t_mem_mosi;
--- SIGNAL reg_epcs_miso                  : t_mem_miso;
--- SIGNAL reg_remu_mosi                  : t_mem_mosi;
--- SIGNAL reg_remu_miso                  : t_mem_miso;
 -- SIGNAL reg_bsn_monitor_mosi           : t_mem_mosi;
 -- SIGNAL reg_bsn_monitor_miso           : t_mem_miso;
 -- SIGNAL reg_dp_offload_tx_mosi         : t_mem_mosi;
@@ -177,10 +169,6 @@ ENTITY mmm_compaan_unb1_10g_bg_db IS
     eth1g_reg_miso                 : IN  t_mem_miso := c_mem_miso_rst;
     eth1g_tse_mosi                 : OUT t_mem_mosi;
     eth1g_tse_miso                 : IN  t_mem_miso := c_mem_miso_rst;
-    reg_epcs_mosi                  : OUT t_mem_mosi;
-    reg_epcs_miso                  : IN  t_mem_miso := c_mem_miso_rst;
-    reg_remu_mosi                  : OUT t_mem_mosi;
-    reg_remu_miso                  : IN  t_mem_miso := c_mem_miso_rst;
     reg_bsn_monitor_mosi           : OUT t_mem_mosi;
     reg_bsn_monitor_miso           : IN  t_mem_miso := c_mem_miso_rst;
     reg_dp_offload_tx_mosi         : OUT t_mem_mosi;
@@ -288,7 +276,7 @@ ARCHITECTURE str OF mmm_compaan_unb1_10g_bg_db IS
       reg_unb_sens_clk_export                    : out std_logic;
       ram_diag_data_buffer_clk_export            : out std_logic;
       reg_tr_xaui_address_export                 : out std_logic_vector(10 downto 0);
-      ram_diag_bg_address_export                 : out std_logic_vector(8 downto 0);
+      ram_diag_bg_address_export                 : out std_logic_vector(9 downto 0);
       ram_diag_bg_write_export                   : out std_logic;
       reg_diag_data_buffer_reset_export          : out std_logic;
       reg_dp_offload_tx_hdr_dat_writedata_export : out std_logic_vector(31 downto 0);
@@ -357,7 +345,7 @@ ARCHITECTURE str OF mmm_compaan_unb1_10g_bg_db IS
       pio_system_info_reset_export               : out std_logic;
       reg_bsn_monitor_writedata_export           : out std_logic_vector(31 downto 0);
       pio_system_info_read_export                : out std_logic;
-      reg_bsn_monitor_address_export             : out std_logic_vector(5 downto 0);
+      reg_bsn_monitor_address_export             : out std_logic_vector(6 downto 0);
       reg_mdio_1_reset_export                    : out std_logic;
       reg_wdi_clk_export                         : out std_logic;
       reg_diag_bg_write_export                   : out std_logic;
@@ -427,10 +415,6 @@ BEGIN
           PORT MAP(mm_rst, mm_clk, eth1g_reg_mosi, eth1g_reg_miso );
     u_mm_file_eth1g_tse  :  mm_file GENERIC MAP(mmf_unb_file_prefix(g_sim_unb_nr, c_sim_node_nr, c_sim_node_type) & "ETH1G_TSE")
           PORT MAP(mm_rst, mm_clk, eth1g_tse_mosi, eth1g_tse_miso );
-    u_mm_file_reg_epcs  :  mm_file GENERIC MAP(mmf_unb_file_prefix(g_sim_unb_nr, c_sim_node_nr, c_sim_node_type) & "REG_EPCS")
-          PORT MAP(mm_rst, mm_clk, reg_epcs_mosi, reg_epcs_miso );
-    u_mm_file_reg_remu  :  mm_file GENERIC MAP(mmf_unb_file_prefix(g_sim_unb_nr, c_sim_node_nr, c_sim_node_type) & "REG_REMU")
-          PORT MAP(mm_rst, mm_clk, reg_remu_mosi, reg_remu_miso );
     u_mm_file_reg_bsn_monitor  :  mm_file GENERIC MAP(mmf_unb_file_prefix(g_sim_unb_nr, c_sim_node_nr, c_sim_node_type) & "REG_BSN_MONITOR")
           PORT MAP(mm_rst, mm_clk, reg_bsn_monitor_mosi, reg_bsn_monitor_miso );
     u_mm_file_reg_dp_offload_tx  :  mm_file GENERIC MAP(mmf_unb_file_prefix(g_sim_unb_nr, c_sim_node_nr, c_sim_node_type) & "REG_DP_OFFLOAD_TX")
@@ -537,7 +521,7 @@ BEGIN
       pio_system_info_reset_export               => OPEN,
       pio_system_info_write_export               => reg_unb_system_info_mosi.wr,
       pio_system_info_writedata_export           => reg_unb_system_info_mosi.wrdata(c_word_w-1 DOWNTO 0),
-      ram_diag_bg_address_export                 => ram_diag_bg_mosi.address(8 DOWNTO 0),
+      ram_diag_bg_address_export                 => ram_diag_bg_mosi.address(9 DOWNTO 0),
       ram_diag_bg_clk_export                     => OPEN,
       ram_diag_bg_read_export                    => ram_diag_bg_mosi.rd,
       ram_diag_bg_readdata_export                => ram_diag_bg_miso.rddata(c_word_w-1 DOWNTO 0),
@@ -551,7 +535,7 @@ BEGIN
       ram_diag_data_buffer_reset_export          => OPEN,
       ram_diag_data_buffer_write_export          => ram_diag_data_buffer_mosi.wr,
       ram_diag_data_buffer_writedata_export      => ram_diag_data_buffer_mosi.wrdata(c_word_w-1 DOWNTO 0),
-      reg_bsn_monitor_address_export             => reg_bsn_monitor_mosi.address(5 DOWNTO 0),
+      reg_bsn_monitor_address_export             => reg_bsn_monitor_mosi.address(6 DOWNTO 0),
       reg_bsn_monitor_clk_export                 => OPEN,
       reg_bsn_monitor_read_export                => reg_bsn_monitor_mosi.rd,
       reg_bsn_monitor_readdata_export            => reg_bsn_monitor_miso.rddata(c_word_w-1 DOWNTO 0),