diff --git a/apps/renderer.c b/apps/renderer.c
index 4c9dcf516d00c607b208ae8c05cc20f770491dfe..ff4c74cde3cda72c14e090fe6c36b8ff818e2358 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -328,11 +328,7 @@ static const CmdLnParser_Option cliOptions[] = {
       .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" },
     {
         .id = CmdLnOptionId_noDelayCmp,
-#ifdef FIX_929_RENDERER_CMDL
         .match = "no_delay_compensation",
-#else
-        .match = "no_delay_comparison",
-#endif
         .matchShort = "no_delay_cmp",
         .description = "[flag] Turn off delay compensation",
     },
diff --git a/lib_com/options.h b/lib_com/options.h
index f2bd4eddb9b73aa4ce03db397dde21b244c03f34..ee1d1b1559547b00d56674fd63f9b8eea136d4ae 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -152,10 +152,6 @@
 /*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */
 
 #define FIX_CRASH_LONG_BRIR                             /* Orange : Fix crash when long BRIR is set */
-#define FIX_SPLITREND_WARNINGS                          /* FhG: fix warnings related to split rendering observed in build jobs */
-#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */
-#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */
-#define FIX_929_RENDERER_CMDL                           /* Nokia: issue #929: renderer command line option */
 #define FIX_910_REMOVE_DUPLICATION_TD_REND              /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */
 #define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */
 
@@ -166,9 +162,6 @@
 /* all switches in this category should start with "NONBE_" */
 
 #define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
-#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */
-#define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 908: fix crash in OSBA BR switching with long test vectors */
-#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR               /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */
 #define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING                 /* Dlb: issue 907: fix for band mapping at VLBR */
 #define NONBE_FIX_869_MASA_PREREND_MERGE                      /* Nokia: issue: #869: MASA pre-rend not updating energy */
 #define NONBE_FIX_931_IGF_STEREO_DEC_NOISE	                  /* FhG: issue #931: fix noise substitution in the stereo IGF decoder      */
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c
index 6ece78587daeb7da3639eae929661d54251575ab..964a1fcd9cc930308ccc092f124e01adea299925 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -1229,11 +1229,7 @@ ivas_error ivas_binRenderer_open(
     }
 
     /* Allocate memories needed for reverb module */
-#ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR
     if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
-#else
-    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
-#endif
     {
         if ( ( error = ivas_binaural_reverb_open_fastconv( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK )
         {
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 6352df9df5d8fbce8ae640adf37eeb62da4a0415..375ba442bf5d357a5423dfc973acbd93356c84fc 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -2110,11 +2110,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels(
         {
             num_tc = CPE_CHANNELS;
         }
-#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA
         if ( num_tc == 3 )
-#else
-        if ( ( st_ivas->sba_planar && num_tc >= 3 ) || ( num_tc == 3 ) )
-#endif
         {
             num_tc++;
         }
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c
index 2cc4e19adea88a3d470c1f31500bb43248d3ea90..73ced6e6c9a52f67402f56e5ff5da70c0dd8d5eb 100644
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec.c
@@ -313,11 +313,7 @@ ivas_error ivas_sba_dec_reconfigure(
             }
         }
 
-#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH
         if ( hSpar->hPCA == NULL && st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 && ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) )
-#else
-        if ( hSpar->hPCA == NULL && st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 && st_ivas->ivas_format == SBA_FORMAT )
-#endif
         {
             if ( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL )
             {
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 6ab684163570671617846ecddf985cfddb09e53d..a9e907bae263c64fe6a21774c004354a4eb2bf7b 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -2153,11 +2153,7 @@ ivas_error IVAS_DEC_GetDelay(
     nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f );
     nSamples[0] = nSamples[1] + nSamples[2];
 
-#ifdef FIX_921_OMASA_DELAY_PRINTOUT
     if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )
-#else
-    if ( st_ivas->ivas_format == MASA_FORMAT )
-#endif
     {
         /* note: in MASA, all delay is compensated at the decoder by default, so subtract the encoder delay for print-out */
         nSamples[1] -= NS2SA( hDecoderConfig->output_Fs, IVAS_ENC_DELAY_NS );
@@ -3715,11 +3711,7 @@ static ivas_error set_pcm_buffer_to_zero(
             error = IVAS_ERR_INTERNAL;
     }
 
-#ifdef FIX_SPLITREND_WARNINGS
     return error;
-#else
-    return IVAS_ERR_OK;
-#endif
 }
 
 
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index a650bf8bd458fe9e64880e6275acce898529bbfd..cd787be1cc4ef0270540a4027c0faffb0ea60ed5 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -990,11 +990,7 @@ static ivas_error configureEncoder(
     }
 #endif
 
-#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH
     if ( hEncoderConfig->Opt_PCA_ON && !( ( hEncoderConfig->ivas_format == SBA_FORMAT || hEncoderConfig->ivas_format == SBA_ISM_FORMAT ) && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) )
-#else
-    if ( hEncoderConfig->Opt_PCA_ON && !( hEncoderConfig->ivas_format == SBA_FORMAT && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) )
-#endif
     {
         return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "PCA supported at SBA FOA 256 kbps only." );
     }
diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c
index 89a6b80a10fa4797e7749a560e97b6184c59b21a..8001bb600961775fadad1cc91ef653314d2eb82c 100644
--- a/lib_rend/ivas_crend.c
+++ b/lib_rend/ivas_crend.c
@@ -2266,9 +2266,6 @@ ivas_error ivas_rend_crendProcessSubframesSplitBin(
     ivas_error error;
     float gain_lfe;
     float tmpLfeBuffer[L_FRAME48k];
-#ifndef FIX_SPLITREND_WARNINGS
-    float *p_bin_output[BINAURAL_CHANNELS];
-#endif
     int16_t original_subframes_rendered, original_slots_rendered;
     float tmpInputBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];
     float *p_tmpInputBuffer[MAX_OUTPUT_CHANNELS];
@@ -2343,13 +2340,6 @@ ivas_error ivas_rend_crendProcessSubframesSplitBin(
 
         pCombinedOrientationDataLocal = &combinedOrientationDataLocal;
 
-#ifndef FIX_SPLITREND_WARNINGS
-        /* set output channels */
-        for ( i = 0; i < BINAURAL_CHANNELS; i++ )
-        {
-            p_bin_output[i] = output[pos_idx * BINAURAL_CHANNELS + i];
-        }
-#endif
         hTcBuffer->subframes_rendered = original_subframes_rendered;
         hTcBuffer->slots_rendered = original_slots_rendered;
 
diff --git a/lib_util/cmdln_parser.c b/lib_util/cmdln_parser.c
index 82119948655590e12e603faf8bd3fe6d4feae00e..7fc325c0e0b038d7bbfdb467dca6e99a28850baf 100644
--- a/lib_util/cmdln_parser.c
+++ b/lib_util/cmdln_parser.c
@@ -150,7 +150,6 @@ static int8_t optionMatchesString(
 
     const char *optionName = stringToOptionName( str );
 
-#ifdef FIX_923_EXTERNAL_REND_COMMAND_LINE
     char optionName_to_upper[FILENAME_MAX];
     strncpy( optionName_to_upper, optionName, sizeof( optionName_to_upper ) - 1 );
     optionName_to_upper[sizeof( optionName_to_upper ) - 1] = '\0';
@@ -167,9 +166,6 @@ static int8_t optionMatchesString(
     to_upper( matchShort_to_upper );
 
     if ( strncmp( optionName_to_upper, match_to_upper, MAX_OPTION_LENGTH ) == 0 || strncmp( optionName_to_upper, matchShort_to_upper, MAX_OPTION_LENGTH ) == 0 )
-#else
-    if ( strncmp( optionName, opt.props.match, MAX_OPTION_LENGTH ) == 0 || strncmp( optionName, opt.props.matchShort, MAX_OPTION_LENGTH ) == 0 )
-#endif
     {
         return 1;
     }