diff --git a/apps/renderer.c b/apps/renderer.c
index e95977a7f7944e0c8d7dfac8d61e27244e0a37e3..bcb1b53dcc682a5490110c9d10a3e5f3ec732772 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -320,11 +320,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 1be21d8c9d6fb43bc1ad572fca58093cf89946f5..17f20e935b057cfc5f053f674916d85055d4eda9 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -182,7 +182,6 @@
 #define NONBE_1273_ISM_METADATA_COUNTER                 /* VA: FLP issue 1273: fix counter overflow in ISM metadata encoder */
 #define NONBE_FIX_GSC_BSTR                              /* VA: issue 1264 FLP (1189 BASOP): Fix bitstream synchronization between encoder and decoder in ACELP GSC in OMASA */
 #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 NONBE_1319_M2R_PRECISION_ALIGN                  /* Nokia: bring updates from PC code related to OMASA masa2total ratios */
 
@@ -197,11 +196,6 @@
 #define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS
 #define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
 #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.c b/lib_dec/ivas_binRenderer_internal.c
index 95f5f87aa573671670878c6773a61bcd59578c8c..a9b25710dcd776ffffccff3fe2ea10630c903579 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -1225,11 +1225,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 3d987392036acfcf5bd153379ef5038ccf7a9cc7..fd9ae297c3f0b4386675d461abb9de207c4f040d 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -2097,11 +2097,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 4218ff9f06c80d8e57f7efa2bac257a6b7b8da0c..94634c40a3b600f37d871229870beafd352fa820 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_708_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 cd44341d9c83e6b4b41236575955ffe2e4a9d40c..e855f7fe5f2279a503607a76ebf20d7a3e9d30e9 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -2250,11 +2250,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 );
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index b6e40fd0baabb56524117cdded7a811143f25f00..af8bf92b2d9637591b63a4be16b51d6ee0d1985e 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_708_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_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;
     }