diff --git a/applications/aartfaac/designs/aartfaac_bn_sdo/src/vhdl/aartfaac_bn_sdo_udp_sdo.vhd b/applications/aartfaac/designs/aartfaac_bn_sdo/src/vhdl/aartfaac_bn_sdo_udp_sdo.vhd
index 6c4921885879f48da2941c794929d08e44008de0..3d2d52f19a66aea50d0e4c96dcc39759386ad90f 100644
--- a/applications/aartfaac/designs/aartfaac_bn_sdo/src/vhdl/aartfaac_bn_sdo_udp_sdo.vhd
+++ b/applications/aartfaac/designs/aartfaac_bn_sdo/src/vhdl/aartfaac_bn_sdo_udp_sdo.vhd
@@ -144,21 +144,20 @@ ARCHITECTURE wrap OF aartfaac_bn_sdo_udp_sdo IS
   CONSTANT c_nof_offload_streams        : NATURAL := 1;
   CONSTANT c_hdr_field_ovr_init         : STD_LOGIC_VECTOR(c_nof_hdr_fields-1 DOWNTO 0) := "1"&"101"&"111111111001"&"0011"&"1010000000";
   CONSTANT c_data_w                     : NATURAL := c_tech_tse_data_w;
-  CONSTANT c_header_overhead_bytes      : NATURAL := field_slv_out_len(c_hdr_field_arr) / c_byte_w;
-  CONSTANT c_frame_len                  : NATURAL := 9018; -- Max jumbo frame len
-  CONSTANT c_frame_nof_words            : NATURAL := (c_frame_len * c_byte_w ) / c_data_w;
-  CONSTANT c_max_udp_payload_len        : NATURAL := c_frame_len-c_header_overhead_bytes-c_eth_crc_length;
-  CONSTANT c_max_udp_payload_nof_words  : NATURAL := (c_max_udp_payload_len * c_byte_w) / c_data_w;
-  CONSTANT c_max_nof_words_per_block    : NATURAL := c_rsp_terminal_nof_subbands_per_lane * c_rsp_terminal_nof_lanes; -- = 864 (9*96)
-  CONSTANT c_min_nof_words_per_block    : NATURAL := 1;
-  CONSTANT c_max_nof_blocks_per_packet  : NATURAL := c_max_udp_payload_nof_words/c_min_nof_words_per_block;
+--  CONSTANT c_header_overhead_bytes      : NATURAL := field_slv_out_len(c_hdr_field_arr) / c_byte_w;
+--  CONSTANT c_frame_len                  : NATURAL := 9018; -- Max jumbo frame len
+--  CONSTANT c_frame_nof_words            : NATURAL := (c_frame_len * c_byte_w ) / c_data_w;
+--  CONSTANT c_max_udp_payload_len        : NATURAL := c_frame_len-c_header_overhead_bytes-c_eth_crc_length;
+--  CONSTANT c_max_udp_payload_nof_words  : NATURAL := (c_max_udp_payload_len * c_byte_w) / c_data_w;
+--  CONSTANT c_max_nof_words_per_block    : NATURAL := c_rsp_terminal_nof_subbands_per_lane * c_rsp_terminal_nof_lanes; -- = 864 (9*96)
+--  CONSTANT c_min_nof_words_per_block    : NATURAL := 1;
+--  CONSTANT c_max_nof_blocks_per_packet  : NATURAL := c_max_udp_payload_nof_words/c_min_nof_words_per_block;
 
   CONSTANT c_nof_signal_paths           : NATURAL := 96;
   CONSTANT c_nof_subbands_per_block     : NATURAL := 8;
   CONSTANT c_nof_timesamples_per_packet : NATURAL := 2;
-
-  CONSTANT c_def_nof_words_per_block    : NATURAL := c_nof_subbands_per_block*c_nof_signal_paths;
-  CONSTANT c_def_nof_blocks_per_packet  : NATURAL := c_nof_timesamples_per_packet;
+  CONSTANT c_nof_words_per_block        : NATURAL := c_nof_subbands_per_block*c_nof_signal_paths;
+  CONSTANT c_nof_blocks_per_packet      : NATURAL := c_nof_timesamples_per_packet;
 
   SIGNAL dp_offload_tx_snk_in_arr       : t_dp_sosi_arr(c_nof_offload_streams-1 DOWNTO 0);
   SIGNAL hdr_fields_in_arr              : t_slv_1024_arr(c_nof_offload_streams-1 DOWNTO 0);
@@ -188,11 +187,8 @@ BEGIN
     g_nof_streams               => c_nof_offload_streams,
     g_data_w                    => c_data_w,
     g_use_complex               => TRUE,
-    g_max_nof_words_per_block   => c_max_nof_words_per_block,
-    g_def_nof_words_per_block   => c_def_nof_words_per_block,
-    g_max_nof_blocks_per_packet => c_max_nof_blocks_per_packet,
-    g_def_nof_blocks_per_packet => c_def_nof_blocks_per_packet,
---    g_output_fifo_depth         => c_frame_nof_words,
+    g_nof_words_per_block       => c_nof_words_per_block,
+    g_nof_blocks_per_packet     => c_nof_blocks_per_packet,
     g_hdr_field_arr             => c_hdr_field_arr,
     g_hdr_field_sel             => c_hdr_field_ovr_init
    )
@@ -203,8 +199,8 @@ BEGIN
     dp_rst                => dp_rst,
     dp_clk                => dp_clk,
 
-    reg_mosi              => reg_dp_offload_tx_mosi,
-    reg_miso              => reg_dp_offload_tx_miso,
+--    reg_mosi              => reg_dp_offload_tx_mosi,
+--    reg_miso              => reg_dp_offload_tx_miso,
 
     reg_hdr_dat_mosi      => reg_dp_offload_tx_hdr_dat_mosi,
     reg_hdr_dat_miso      => reg_dp_offload_tx_hdr_dat_miso,