diff --git a/apps/renderer.c b/apps/renderer.c
index 27ac0dcb23801bd7a092cc29ad8df344400467c8..480ed47fbaa28d3488934d657a69a96bf6e821aa 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -323,11 +323,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 aa9f085ccb4e077a0108f50a43a1108186ce49b9..5d5886b4fd175d15a1d25c5c3b763f38eb53b885 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -166,7 +166,6 @@
 #define FIX_1300_ICA_SHIFT_QUANT_IMPROV         /* VA: Fix to 1300 to improve precision of the lag quantizer */
 #define FIX_1301_CORRECT_TD_CNST                /* VA: Fix 1301, correct wrong constant in TD stereo */
 #define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: FLP issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */
-#define NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH   /* FhG: issue 708: fix crash in OSBA BR switching with long test vectors */
 //#define OPT_STEREO_32KBPS_V1                    /* Optimization made in stereo decoding path for 32kbps decoding */
 #define DOT_PROD_CHOLESKY_64BIT                 /* FhG: Issue 1323, optimized 64 bit implementation of dot_product_cholesky() */
 #define OPT_BASOP_ADD_v1                        /* optimizations to avoid usage of BASOP_Util_Add_MantExp */
@@ -183,11 +182,6 @@
 #define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
 #define FIX_1372_ISAR_POST_REND
 #endif
-#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 NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */
-#define FIX_929_RENDERER_CMDL                   /* Nokia: issue #929: renderer command line option */
-#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR               /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */
 #define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
 #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 */
diff --git a/lib_dec/ivas_binRenderer_internal_fx.c b/lib_dec/ivas_binRenderer_internal_fx.c
index 62933b7a4d2b38650a40c937c14822b878031fae..6f550eab943ab95933937dbda06e4c3093ad169d 100644
--- a/lib_dec/ivas_binRenderer_internal_fx.c
+++ b/lib_dec/ivas_binRenderer_internal_fx.c
@@ -1512,11 +1512,7 @@ ivas_error ivas_binRenderer_open_fx(
 
     /* Allocate memories needed for reverb module */
     test();
-#ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR
     IF( ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
-#else
-    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
-#endif
     {
         IF( NE_32( ( error = ivas_binaural_reverb_open_fastconv_fx( &( 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_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index 119f0aacedfac05b9431707fc58ced7f202dfc13..69bd07c0effbb53b7fdac3588bbadf365b79f682 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -3419,13 +3419,7 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx(
             move16();
         }
 
-#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA
         if ( EQ_16( num_tc, 3 ) )
-#else
-        test();
-        test();
-        if ( ( st_ivas->sba_planar && GE_16( num_tc, 3 ) ) || EQ_16( num_tc, 3 ) )
-#endif
         {
             num_tc = add( num_tc, 1 );
         }
diff --git a/lib_dec/ivas_sba_dec_fx.c b/lib_dec/ivas_sba_dec_fx.c
index e9b72d4a4f0ff461c8dc6f20eb10e6109f46edc1..7f6c4f287c16cc8f305705e96c7f63a9dfc86456 100644
--- a/lib_dec/ivas_sba_dec_fx.c
+++ b/lib_dec/ivas_sba_dec_fx.c
@@ -361,12 +361,8 @@ ivas_error ivas_sba_dec_reconfigure_fx(
         test();
         test();
         test();
-#ifdef NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH
         test();
         IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && ( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) )
-#else
-        IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && EQ_32( 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_fx.c b/lib_dec/lib_dec_fx.c
index b4a27bf1a9d70f99f76c76dbc5e558eac9a4bed9..6e906dd93cc6441f4fb83068eda3f42fe050c836 100644
--- a/lib_dec/lib_dec_fx.c
+++ b/lib_dec/lib_dec_fx.c
@@ -2841,12 +2841,8 @@ ivas_error IVAS_DEC_GetDelay(
     nSamples[0] = add( nSamples[1], nSamples[2] );
     move16();
 
-#ifdef FIX_921_OMASA_DELAY_PRINTOUT
     test();
     IF( EQ_16( (Word16) st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( (Word16) st_ivas->ivas_format, MASA_ISM_FORMAT ) )
-#else
-    IF( EQ_16( (Word16) 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] = sub( nSamples[1], NS2SA_FX2( hDecoderConfig->output_Fs, IVAS_ENC_DELAY_NS ) );
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index e90381597122d500c067b177ed565f86b62572b0..3ff4774e60a14f494228de229aafdb265c425633 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -1166,11 +1166,7 @@ static ivas_error configureEncoder(
     test();
     test();
     test();
-#ifdef NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH
     IF( hEncoderConfig->Opt_PCA_ON && !( ( EQ_16( hEncoderConfig->ivas_format, SBA_FORMAT ) || EQ_16( hEncoderConfig->ivas_format, SBA_ISM_FORMAT ) ) && EQ_32( hEncoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( 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_util/cmdln_parser.c b/lib_util/cmdln_parser.c
index 432db36a52900a161c87c63ede257de1c78501a8..1b9eb7a92899f1b62df0e925fc7f3882c2512012 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;
     }