diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index 69822b590c9f8492575213d00b803365948642e7..95f7ec154906483b828a857fbc6e330a93a9b7bc 100644
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1415,16 +1415,8 @@ typedef enum
 #define LFE_CHANNEL                             3
 
 #define MIN_LFE_NRG                             0.5f
-#ifdef ADJUST_MCT_CHANNELS_MAX   
 #define MCT_MAX_CHANNELS                        11                          /* == 7.1.4 LS channels without the LFE channel */
 #define MCT_MAX_BLOCKS                          ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
-#else
-#define MCT_MAX_CHANNELS                        MAX_TRANSPORT_CHANNELS
-#define MCT_MAX_BLOCKS                          ( MCT_MAX_CHANNELS / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
-
-#define MAX_NUM_DATA                            max( MCT_MAX_CHANNELS, 4 )
-#endif
-
 #define NBBITS_MCT_RATIO                        4
 #define BITRATE_MCT_RATIO_RANGE                 ( 1 << NBBITS_MCT_RATIO )   /* Range of the coded bitrate distribution ratio */
 
diff --git a/lib_com/options.h b/lib_com/options.h
index 73a330f04dfc6e38cda13e1baac29ada307d69b0..ba2a7116c5f5bb74f04d303506370a24a2bbdf04 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -139,7 +139,6 @@
 #define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */
 #define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */
 #define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/
-#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/
 #define FIX_1053_REVERB_RECONFIGURATION
 #define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
 #define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */
diff --git a/lib_dec/ivas_mct_core_dec_fx.c b/lib_dec/ivas_mct_core_dec_fx.c
index 3a2cd3118ae5b7ababf7726087d91f5e0f2626dd..f96a20126250b065cfcc5d50b404ae4c780ba283 100644
--- a/lib_dec/ivas_mct_core_dec_fx.c
+++ b/lib_dec/ivas_mct_core_dec_fx.c
@@ -75,16 +75,12 @@ void ivas_mct_side_bits_fx(
     {
         FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             IF( LT_16( i, MCT_MAX_CHANNELS ) )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
                 i = add( i, 1 );
                 move16();
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
         }
     }
 
@@ -225,30 +221,13 @@ void ivas_mct_core_dec(
     {
         FOR( ch = 0; ch < CPE_CHANNELS; ( ch++, i++ ) )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             IF( LT_16( i, MCT_MAX_CHANNELS ) )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
         }
     }
 
-#ifndef ADJUST_MCT_CHANNELS_MAX
-    /*seems like obsolete code*/
-    i = 0;
-    move16();
-    FOR( ch = 0; ch < nChannels; ch++ )
-    {
-        IF( EQ_32( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
-        {
-            CONTINUE;
-        }
-        i = add( i, 1 );
-    }
-#endif
     bfi = sts[0]->bfi;
     move16();
 
diff --git a/lib_enc/ivas_mct_core_enc_fx.c b/lib_enc/ivas_mct_core_enc_fx.c
index e42ee56d716ea63ea6e34bd259c3f08430bca1fc..9bbf1260c8ed61e487b4b01a99eb6c38ebaea869 100644
--- a/lib_enc/ivas_mct_core_enc_fx.c
+++ b/lib_enc/ivas_mct_core_enc_fx.c
@@ -333,14 +333,10 @@ void ivas_mct_core_enc_fx(
     {
         FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             IF( LT_16( add( i_mult( cpe_id, CPE_CHANNELS ), ch ), nChannels ) )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
 
             IF( EQ_32( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
             {