diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd
index 3a0dcd21954fbd0972d536a9635d20341e0e0c3d..101d3bc906c3ee5acec9a5cc960dade83993b544 100644
--- a/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd
+++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd
@@ -122,9 +122,7 @@ ENTITY ctrl_unb1_board IS
     ----------------------------------------------------------------------------
     g_fpga_temp_high : NATURAL := 85;
     g_app_led_red    : BOOLEAN := FALSE;  -- when TRUE use external LED control via app_led_red
-    g_dbg_led_red    : BOOLEAN := FALSE;  -- [when g_app_led_red=FALSE]: when TRUE connect pout_debug_wave to the LEDs; otherwise let ctrl_unb1_board toggle them
     g_app_led_green  : BOOLEAN := FALSE;  -- when TRUE use external LED control via app_led_green
-    g_dbg_led_green  : BOOLEAN := FALSE;  -- [when g_app_led_green=FALSE]: when TRUE connect pout_debug_wave to the LEDs; otherwise let ctrl_unb1_board toggle them
     
     g_aux            : t_c_unb1_board_aux := c_unb1_board_aux
   );
@@ -156,10 +154,8 @@ ENTITY ctrl_unb1_board IS
     app_led_green          : IN STD_LOGIC := '1';
     
     -- PIOs
-    pout_debug_wave        : IN  STD_LOGIC_VECTOR(c_word_w-1 DOWNTO 0) := (OTHERS=> '0');
+    pout_debug_wave        : IN  STD_LOGIC_VECTOR(c_word_w-1 DOWNTO 0) := (OTHERS=> '0'); -- to be removed soon
     pout_wdi               : IN  STD_LOGIC;                              -- Toggled by unb_osy; can be overriden by reg_wdi.
-    pin_system_info        : OUT STD_LOGIC_VECTOR(c_word_w-1 DOWNTO 0);
-    pin_pps                : OUT STD_LOGIC_VECTOR(c_word_w-1 DOWNTO 0);  -- for new designs best use reg_ppsh_mosi/miso
 
     -- Manual WDI override
     reg_wdi_mosi           : IN  t_mem_mosi := c_mem_mosi_rst;
@@ -405,8 +401,6 @@ BEGIN
     hw_version  => VERSION,
     id          => ID,
 
-    info        => pin_system_info,
-
     reg_mosi    => reg_unb_system_info_mosi, 
     reg_miso    => reg_unb_system_info_miso,
 
@@ -428,13 +422,7 @@ BEGIN
   END GENERATE;
 
   no_app_led_red: IF g_app_led_red = FALSE GENERATE
-    gen_dbg_led_red: IF g_dbg_led_red = TRUE GENERATE
-      TESTIO(c_unb1_board_testio_led_red)   <= pout_debug_wave(pout_debug_wave'HIGH); -- [31]   
-    END GENERATE;
-
-    gen_toggle_led_red: IF g_dbg_led_red = FALSE GENERATE
-      TESTIO(c_unb1_board_testio_led_red)   <= led_toggle_red;   
-    END GENERATE;
+    TESTIO(c_unb1_board_testio_led_red)   <= led_toggle_red;   
   END GENERATE;
 
 
@@ -448,13 +436,7 @@ BEGIN
   END GENERATE;
 
   no_app_led_green: IF g_app_led_green = FALSE GENERATE
-    gen_dbg_led_green: IF g_dbg_led_green = TRUE GENERATE
-      TESTIO(c_unb1_board_testio_led_green)   <= pout_debug_wave(pout_debug_wave'HIGH-1); -- [30]
-    END GENERATE;
-
-    gen_toggle_led_green: IF g_dbg_led_green = FALSE GENERATE
-      TESTIO(c_unb1_board_testio_led_green)   <= led_toggle_green;   
-    END GENERATE;
+    TESTIO(c_unb1_board_testio_led_green)   <= led_toggle_green;   
   END GENERATE;
 
 
@@ -559,9 +541,6 @@ BEGIN
     reg_mosi         => reg_ppsh_mosi,
     reg_miso         => reg_ppsh_miso,
     
-    -- Old PIO support (for backwards compatibility with pin_pps on ctrl_unb1_board)
-    pin_pps          => pin_pps,
-    
     -- Streaming clock domain
     pps_sys          => dp_pps
   );