diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index abd6865ca09c1fa0288f35ebb264e03ca43f3f43..a6ad6440c93cd4af2a67e6f55affcccaf2d1cb9a 100644
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1100,7 +1100,7 @@ typedef enum
 
 #define IVAS_SPAR_BR_TABLE_LEN                  20
 
-/* TD decorr */ // ToDo: not all 16CH are currently supported -> to be revisited later
+/* TD decorr */
 enum
 {
     IVAS_TD_DECORR_OUT_1CH = 1,
@@ -1110,19 +1110,11 @@ enum
     IVAS_TD_DECORR_OUT_5CH,
     IVAS_TD_DECORR_OUT_6CH,
     IVAS_TD_DECORR_OUT_7CH,
-    IVAS_TD_DECORR_OUT_8CH,
-    IVAS_TD_DECORR_OUT_9CH,
-    IVAS_TD_DECORR_OUT_10CH,
-    IVAS_TD_DECORR_OUT_11CH,
-    IVAS_TD_DECORR_OUT_12CH,
-    IVAS_TD_DECORR_OUT_13CH,
-    IVAS_TD_DECORR_OUT_14CH,
-    IVAS_TD_DECORR_OUT_15CH,
-    IVAS_TD_DECORR_OUT_16CH
+    IVAS_TD_DECORR_OUT_8CH
 };
 
 #define IVAS_SPAR_MAX_DMX_CHS                   4
-#define IVAS_MAX_DECORR_CHS                     IVAS_TD_DECORR_OUT_15CH
+#define IVAS_MAX_DECORR_CHS                     IVAS_TD_DECORR_OUT_8CH 
 #define IVAS_MAX_DECORR_APD_SECTIONS            16
 #define IVAS_APD_2_SECT                         2
 #define IVAS_APD_4_SECT                         4
diff --git a/lib_com/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c
index 4bf813ac35a0af46eedcaf4a3b91af489d722ae9..a1af629f0c062190264ecd864254ae5fde057a97 100644
--- a/lib_com/ivas_td_decorr.c
+++ b/lib_com/ivas_td_decorr.c
@@ -326,23 +326,12 @@ static int16_t ivas_get_APD_filt_orders(
         case IVAS_TD_DECORR_OUT_4CH:
             num_apd_sections = IVAS_APD_4_SECT;
             break;
-
         case IVAS_TD_DECORR_OUT_5CH:
         case IVAS_TD_DECORR_OUT_6CH:
         case IVAS_TD_DECORR_OUT_7CH:
         case IVAS_TD_DECORR_OUT_8CH:
             num_apd_sections = IVAS_APD_8_SECT;
             break;
-        case IVAS_TD_DECORR_OUT_9CH:
-        case IVAS_TD_DECORR_OUT_10CH:
-        case IVAS_TD_DECORR_OUT_11CH:
-        case IVAS_TD_DECORR_OUT_12CH:
-        case IVAS_TD_DECORR_OUT_13CH:
-        case IVAS_TD_DECORR_OUT_14CH:
-        case IVAS_TD_DECORR_OUT_15CH:
-        case IVAS_TD_DECORR_OUT_16CH:
-            num_apd_sections = IVAS_APD_16_SECT;
-            break;
         default:
             assert( !"Invalid num out chans" );
             break;
@@ -359,7 +348,6 @@ static int16_t ivas_get_APD_filt_orders(
     {
         APD_filt_orders[i] = (int16_t) ceil( output_Fs * IVAS_DECORR_PARM_APD_TAU * R[i] / sum_R );
     }
-
     return num_apd_sections;
 }
 
diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c
index 6adfbd029667b30f41540c34c0261973e393a9ba..04f7a72ce1dfbb069d7ff3d521492e6fd222e9d5 100644
--- a/lib_dec/ivas_dirac_dec.c
+++ b/lib_dec/ivas_dirac_dec.c
@@ -466,10 +466,6 @@ static ivas_error ivas_dirac_rend_config(
         {
             hDirACRend->num_protos_diff = 1;
             hDirACRend->num_protos_dir = nchan_transport;
-            if ( ( st_ivas->sba_planar ) && ( !( st_ivas->ivas_format == SBA_FORMAT ) ) ) // Todo Dolby/FhG refactor: Is this ever true?
-            {
-                hDirACRend->num_protos_dir++;
-            }
 
             for ( k = 0; k < min( hDirACRend->num_outputs_dir, hDirACRend->num_protos_dir ); k++ )
             {
@@ -1882,7 +1878,6 @@ void ivas_dirac_dec_render_sf(
     {
         md_idx = hSpatParamRendCom->render_to_md_map[slot_idx_start];
     }
-    /* ToDo: Another workaround for self test BE */
 
     /* copy parameters into local buffers*/
     if ( hDirAC->hConfig->dec_param_estim == FALSE )
diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c
index c8486d3d260950b21eb8622bf75cb117352247f1..89ac1d6379c85c27e5e2aff293d8e5b3e4aa214e 100644
--- a/lib_enc/ivas_spar_md_enc.c
+++ b/lib_enc/ivas_spar_md_enc.c
@@ -45,7 +45,6 @@
 /*------------------------------------------------------------------------------------------*
  * PreProcessor
  *------------------------------------------------------------------------------------------*/
-#define IVAS_MAX_MD_BYTES ( 1000 ) // ToDo: not used
 
 static const float pr_boost_range[2] = { 0.1f, 0.4f };