diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h
index 4956a1aa6944bc5fd9f39da68210a0d11ad03739..ad74f9136cad5e6544a2cdf92084b31297cd02d9 100644
--- a/lib_com/common_api_types.h
+++ b/lib_com/common_api_types.h
@@ -340,9 +340,6 @@ typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
 
 typedef struct _IVAS_RENDER_CONFIG
 {
-#ifdef DEBUGGING
-    IVAS_RENDER_TYPE_OVERRIDE renderer_type_override;
-#endif
     IVAS_ROOM_ACOUSTICS_CONFIG_DATA roomAcoustics;
     ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;
     float directivity[IVAS_MAX_NUM_OBJECTS * 3];
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index e825acb373c1a695cceee74192c3b1524ba7deb0..1f66f3f3089886b6608e892f383aa747f33f7796 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config.c
@@ -127,12 +127,6 @@ void ivas_renderer_select(
                 else
                 {
                     *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;
-#ifdef DEBUGGING
-                    if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
-                    {
-                        *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
-                    }
-#endif
                     *internal_config = IVAS_AUDIO_CONFIG_7_1_4;
                 }
             }
@@ -243,16 +237,6 @@ void ivas_renderer_select(
                     {
                         *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
                     }
-#ifdef DEBUGGING
-                    if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
-                    {
-                        *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;
-                    }
-                    else if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
-                    {
-                        *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
-                    }
-#endif
                 }
             }
         }
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 46eff67b234a6dc3b025d70f49ac94d330fd29ee..b6b8efc3a5cdfca8769acdc2a609b262e9052dcf 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -3220,20 +3220,6 @@ static ivas_error copyRendererConfigStruct(
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-#ifdef DEBUGGING
-    switch ( hRCin->renderer_type_override )
-    {
-        case IVAS_RENDER_TYPE_OVERRIDE_CREND:
-            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
-            break;
-        case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:
-            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
-            break;
-        default:
-            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
-            break;
-    }
-#endif
     hRCout->roomAcoustics.aeID = hRCin->roomAcoustics.aeID;
     hRCout->roomAcoustics.nBands = hRCin->roomAcoustics.nBands;
     hRCout->roomAcoustics.acousticPreDelay = hRCin->roomAcoustics.acousticPreDelay;
@@ -3321,17 +3307,6 @@ ivas_error IVAS_DEC_FeedRenderConfig(
     hRenderConfig = hIvasDec->st_ivas->hRenderConfig;
     st_ivas = hIvasDec->st_ivas;
 
-#ifdef DEBUGGING
-    hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
-    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
-    {
-        hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
-    }
-    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
-    {
-        hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
-    }
-#endif
     hRenderConfig->roomAcoustics.aeID = renderConfig.roomAcoustics.aeID;
     hRenderConfig->roomAcoustics.nBands = renderConfig.roomAcoustics.nBands;
     hRenderConfig->roomAcoustics.acousticPreDelay = renderConfig.roomAcoustics.acousticPreDelay;
@@ -3442,17 +3417,6 @@ static ivas_error feedAcousticEnvPI(
     hRenderConfig = hIvasDec->st_ivas->hRenderConfig;
     st_ivas = hIvasDec->st_ivas;
 
-#ifdef DEBUGGING
-    hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
-    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
-    {
-        hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
-    }
-    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
-    {
-        hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
-    }
-#endif
     /* Ignore if AE ID already in use */
     if ( hRenderConfig->roomAcoustics.aeID == hAcoustEnvPI.aeid )
     {
diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config.c
index 27af0fe19a6e3ed3236f3cf587201ba2b1dfc096..f4348b2cf062ddd000da7340661d5d496e6a00f5 100644
--- a/lib_rend/ivas_render_config.c
+++ b/lib_rend/ivas_render_config.c
@@ -116,9 +116,6 @@ ivas_error ivas_render_config_init_from_rom(
         return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Unexpected null pointer while attempting to fill renderer configuration from ROM" );
     }
 
-#ifdef DEBUGGING
-    ( *hRenderConfig )->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
-#endif
     ( *hRenderConfig )->roomAcoustics.aeID = IVAS_DEFAULT_AEID;
     ( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS;
     ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY;
diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c
index cbc12cebdc6478f6c99a00f029dc788d5562c221..3f9e3aef0ffee1397b9fdf2fe79797cde5c8da37 100644
--- a/lib_rend/ivas_reverb.c
+++ b/lib_rend/ivas_reverb.c
@@ -1123,9 +1123,6 @@ ivas_error ivas_reverb_open(
     params.pHrtf_inter_aural_coherence_const = hHrtfStatistics->inter_aural_coherence;
 
     /* set reverb acoustic configuration based on renderer config  */
-#ifdef DEBUGGING
-    pState->pConfig.renderer_type_override = hRenderConfig->renderer_type_override;
-#endif
     pState->pConfig.roomAcoustics.nBands = hRenderConfig->roomAcoustics.nBands;
 
     if ( hRenderConfig->roomAcoustics.use_er == 1 )
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index d4992ef43e7ac9f96b214bfaf82cb02c1dbb1fe0..ed8c0f008f886d81f81f53cd7b057bec0efd1a45 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -4597,20 +4597,7 @@ ivas_error IVAS_REND_GetRenderConfig(
     }
 
     hRCin = hIvasRend->hRendererConfig;
-#ifdef DEBUGGING
-    switch ( hRCin->renderer_type_override )
-    {
-        case IVAS_RENDER_TYPE_OVERRIDE_CREND:
-            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
-            break;
-        case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:
-            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
-            break;
-        default:
-            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
-            break;
-    }
-#endif
+
     hRCout->roomAcoustics.aeID = hRCin->roomAcoustics.aeID;
     hRCout->roomAcoustics.nBands = hRCin->roomAcoustics.nBands;
     hRCout->roomAcoustics.acousticPreDelay = hRCin->roomAcoustics.acousticPreDelay;
@@ -4665,9 +4652,7 @@ ivas_error IVAS_REND_FeedRenderConfig(
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
     hRenderConfig = hIvasRend->hRendererConfig;
-#ifdef DEBUGGING
-    hRenderConfig->renderer_type_override = renderConfig.renderer_type_override;
-#endif
+
     hRenderConfig->roomAcoustics.aeID = renderConfig.roomAcoustics.aeID;
     hRenderConfig->roomAcoustics.nBands = renderConfig.roomAcoustics.nBands;
     hRenderConfig->roomAcoustics.acousticPreDelay = renderConfig.roomAcoustics.acousticPreDelay;
diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c
index 2508eae95ce0b7dfb11b9a1a5d837fecb9f5c50c..d7cf2cf19580b326bd0070a895d40a9c834560ba 100644
--- a/lib_util/render_config_reader.c
+++ b/lib_util/render_config_reader.c
@@ -1289,27 +1289,6 @@ ivas_error RenderConfigReader_checkValues(
         return IVAS_ERR_WRONG_PARAMS;
     }
 
-#ifdef DEBUGGING
-    /* Specific limits for Jot reverb */
-    if ( hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
-    {
-        if ( ( pRoom_acoustics->acousticPreDelay > ACOUSTICPREDELAY_JOTREV_MAX ) || ( pRoom_acoustics->acousticPreDelay < ACOUSTICPREDELAY_JOTREV_MIN ) )
-        {
-            return IVAS_ERR_WRONG_PARAMS;
-        }
-    }
-
-    /* Specific limits for frequency-domain reverb */
-    if ( hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
-    {
-        if ( ( pRoom_acoustics->acousticPreDelay > ACOUSTICPREDELAY_FDREV_MAX ) || ( pRoom_acoustics->acousticPreDelay < ACOUSTICPREDELAY_FDREV_MIN ) )
-        {
-            return IVAS_ERR_WRONG_PARAMS;
-        }
-    }
-#endif /* DEBUGGING */
-
-
     if ( pRoom_acoustics->use_er == 1 )
     {
         /* Room dimensions */
@@ -2891,27 +2870,7 @@ ivas_error RenderConfigReader_read(
                         }
                         free( pCombinedName );
                     }
-                    else
-#ifdef DEBUGGING
-                        if ( strcmp( item, "RENDERER" ) == 0 )
-                    {
-                        if ( strcmp( pValue, "CREND" ) == 0 )
-                        {
-                            hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
-                        }
-                        else if ( strcmp( pValue, "FASTCONV" ) == 0 )
-                        {
-                            hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
-                        }
-                        else
-                        {
-                            errorHandler( pValue, ERROR_VALUE_INVALID );
-                            return IVAS_ERR_INVALID_RENDER_CONFIG;
-                        }
-                    }
-                    else
-#endif
-                        if ( strcmp( item, "DIRECTIVITY" ) == 0 )
+                    else if ( strcmp( item, "DIRECTIVITY" ) == 0 )
                     {
                         if ( read_txt_vector( pValue, 3, hRenderConfig->directivity ) )
                         {