diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index a06746fbf8c40e9d9ecfe43c1e1e836c53896d04..55c12bad84ef54d80aa27aadd09a934556b7d4bd 100644
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1292,16 +1292,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 e81684d4067c40a3130f42504b81690351bf40f6..d8eaf68e983f2bc71ba132fa5de9a0627d67bd1c 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -191,7 +191,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_ISSUE_2008_MISSING_CODE_FROM_PORTING        /* FhG: Issue 2008: Code deleted while porting float-main MR !1504 (BASOP issue 1565)*/
-#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/
 #define FIX_1053_REVERB_RECONFIGURATION
 #define FIX_1179_USAN_PHASEECU                          /* Eri: issue 1179:  better handling of 16 bit wrap around for very long(>200ms) FER-bursts   */
 #define NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX      /* Ericsson: Issue 1246: High level input which triggers DTX can lead to numerical overflow in coherence calculation */
diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec.c
index c51329b87dcca97877d183208afec8a526fc2901..bc39b72f468e55a214f3444d94c6ee45b4f04031 100644
--- a/lib_dec/ivas_mct_core_dec.c
+++ b/lib_dec/ivas_mct_core_dec.c
@@ -77,15 +77,11 @@ void ivas_mct_side_bits(
     {
         for ( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             if ( i < MCT_MAX_CHANNELS )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
                 i++;
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
         }
     }
 
@@ -201,29 +197,14 @@ void ivas_mct_core_dec(
     {
         for ( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             if ( i < MCT_MAX_CHANNELS )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
                 i++;
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
         }
     }
 
-#ifndef ADJUST_MCT_CHANNELS_MAX
-    /*seems like obsolete code*/
-    for ( ch = 0, i = 0; ch < nChannels; ch++ )
-    {
-        if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
-        {
-            continue;
-        }
-        i++;
-    }
-#endif
     bfi = sts[0]->bfi;
 
     for ( ch = 0; ch < nChannels; ch++ )
diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c
index 49036ed4a135bbc947f23201af330f01481495fc..59e04c5cb8849fa830744ff7e2a0a3e0188c9f2c 100644
--- a/lib_enc/ivas_mct_core_enc.c
+++ b/lib_enc/ivas_mct_core_enc.c
@@ -265,14 +265,10 @@ void ivas_mct_core_enc(
     {
         for ( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             if ( cpe_id * CPE_CHANNELS + ch < nChannels )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
 
             if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
             {