diff --git a/apps/decoder.c b/apps/decoder.c
index 5d126a27e54983089f598c19b8c7bacd77f12ceb..37e3cc760810beb1334d37b3ad30b037d2f09eb1 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -1289,7 +1289,6 @@ static bool parseCmdlIVAS_dec(
      * Mandatory input arguments
      *-----------------------------------------------------------------*/
 
-#ifdef FIX_956_DECODER_COMMAND_LINE_FIX
     if ( i < argc - 4 )
     {
         for ( i = 1; i < argc; i++ )
@@ -1307,9 +1306,6 @@ static bool parseCmdlIVAS_dec(
         return false;
     }
     else if ( i < argc - 3 )
-#else
-    if ( i < argc - 3 )
-#endif
     {
         arg->outputConfig = cmdline2config( argv[i] );
         if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )
diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index e65ecc2cf2ccf57e3905aac173b953546f05a742..5ceac3b0324230215c994441b90b63f473b4cf0b 100644
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -360,9 +360,7 @@ typedef enum
 #define ISM_Q_STEP_BORDER                       5.0f
 #define ISM_Q_STEP_BORDER_FX                    ( 20971520 )    // Q22
 
-#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
 #define ISM_FEC_MAX                             10
-#endif
 
 #define ISM_RADIUS_NBITS                        6 
 #define ISM_RADIUS_MIN                          0.0f
diff --git a/lib_com/options.h b/lib_com/options.h
index f958121273da3f39db429369c2e7b9f07a9f3d22..71e860604575fbb22f261c97f14c2dffe440c66c 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -67,7 +67,6 @@
 #define BASOP_NOGLOB_DECLARE_LOCAL
 #endif
 
-#define FIX_954_OTR_REF_VEC                             /* FhG: Fix forward vector direction for OTR REF VEC mode */
 #define FIX_867_CLDFB_NRG_SCALE
 
 #define FIX_1378_ACELP_OUT_OF_BOUNDS
@@ -94,15 +93,11 @@
 #define FIX_1372_ISAR_POST_REND
 #endif
 #define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
-#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA           /* Nokia: issue 944: fix FEC error in OMASA */
-#define NONBE_FIX_949_MC_5MS_FRAMING                    /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */
 #define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/
-#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */
 #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER     /* Qualcomm: issue 953: fix order or ER channels in LC mode*/
 #define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */
 #define NONBE_FIX_967_ISM_MONO_DMX                      /* FhG: issue 967: accumulating energies in ISM mono DMX */
 
-#define FIX_956_DECODER_COMMAND_LINE_FIX                /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */
 #define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/
 
 /* #################### End BASOP porting switches ############################ */
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index 304a853425549b25235efb99af1cd86191c926b8..88cba4da4f5c604f5851d8ae3ee795a72d523cf1 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -1952,14 +1952,6 @@ ivas_error ivas_jbm_dec_render_fx(
             {
                 ivas_dirac_dec_binaural_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output_fx );
             }
-#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE
-            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_NON_DIEGETIC_DOWNMIX ) )
-            {
-                *nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
-                move16();
-                ivas_apply_non_diegetic_panning_fx( p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered );
-            }
-#endif
             ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_PARAM_ISM ) || EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
             {
                 ivas_param_ism_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx );
@@ -2263,12 +2255,10 @@ ivas_error ivas_jbm_dec_render_fx(
     ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )
     {
 
-#ifdef NONBE_FIX_949_MC_5MS_FRAMING
         FOR( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )
         {
             p_tc_fx[n] = &st_ivas->hTcBuffer->tc_fx[n][st_ivas->hTcBuffer->n_samples_rendered];
         }
-#endif
 
         IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )
         {
diff --git a/lib_enc/ivas_ism_metadata_enc_fx.c b/lib_enc/ivas_ism_metadata_enc_fx.c
index 589210cefb745d54f95c8638049def86f781b984..0cd43530689b3c77a53f0d74e90812ebc8dae45a 100644
--- a/lib_enc/ivas_ism_metadata_enc_fx.c
+++ b/lib_enc/ivas_ism_metadata_enc_fx.c
@@ -54,9 +54,6 @@
 #define ISM_MAX_ELEVATION_DIFF_IDX ( ISM_ELEVATION_NBITS - 1 /*zero*/ - 1 /*sign*/ )
 #define ISM_MAX_RADIUS_DIFF_IDX    ( ISM_RADIUS_NBITS - 1 /*zero*/ - 1 /*sign*/ )
 
-#ifndef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
-#define ISM_FEC_MAX 10
-#endif
 #define ISM_MD_FEC_DIFF         10
 #define ISM_MD_FEC_DIFF_Q22     41943040
 #define ISM_MD_INC_DIFF_CNT_MAX 6
diff --git a/lib_enc/ivas_omasa_enc_fx.c b/lib_enc/ivas_omasa_enc_fx.c
index f3c461fa3eb4d8716cf1741162b13d791d9d7ef6..265f2b601b4afc4af9c89895016542541f995fae 100644
--- a/lib_enc/ivas_omasa_enc_fx.c
+++ b/lib_enc/ivas_omasa_enc_fx.c
@@ -45,13 +45,11 @@
 #endif
 
 
-#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
 /*-------------------------------------------------------------------------
  * Local constants
  *------------------------------------------------------------------------*/
 
 #define OMASA_FEC_MAX 5
-#endif
 
 /*-------------------------------------------------------------------------
  * Local function prototypes
@@ -192,10 +190,8 @@ ivas_error ivas_omasa_enc_open_fx(
 
     hOMasa->prev_selected_object = 0;
     hOMasa->changing_object = 0;
-#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
     hOMasa->since_obj_change_cnt = 0;
     move16();
-#endif
     move16();
     move16();
 
@@ -661,7 +657,6 @@ void ivas_omasa_enc_fx(
             move16();
         }
 
-#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
         /* force absolute MD coding in case of change of separated object */
         IF( NE_16( hOMasa->prev_selected_object, selected_object ) )
         {
@@ -680,7 +675,6 @@ void ivas_omasa_enc_fx(
                 move16();
             }
         }
-#endif
         hOMasa->prev_selected_object = selected_object;
         move16();
 
diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h
index f5dddcb77d57f27c004fb4d19e9afda814cddab0..a2247c7a4138f22d981ae9cfcce98e0287e65f88 100644
--- a/lib_enc/ivas_stat_enc.h
+++ b/lib_enc/ivas_stat_enc.h
@@ -873,9 +873,7 @@ typedef struct ivas_omasa_enc_state_structure
 
     Word16 prev_selected_object;
     UWord8 changing_object;
-#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
     Word16 since_obj_change_cnt;
-#endif
 
 } OMASA_ENC_STATE, *OMASA_ENC_HANDLE;
 
diff --git a/lib_rend/ivas_orient_trk_fx.c b/lib_rend/ivas_orient_trk_fx.c
index da2891bb7b9b23f51d11a61c7e446798cdbd9dd7..16d2fcc73e18b18f402269116f276e184e1af7d2 100644
--- a/lib_rend/ivas_orient_trk_fx.c
+++ b/lib_rend/ivas_orient_trk_fx.c
@@ -799,11 +799,7 @@ ivas_error ivas_orient_trk_SetReferenceVector_fx(
         case IVAS_HEAD_ORIENT_TRK_REF:
         case IVAS_HEAD_ORIENT_TRK_AVG:
         case IVAS_HEAD_ORIENT_TRK_REF_VEC:
-#ifdef FIX_954_OTR_REF_VEC
             acousticFrontVector = VectorSubtract_fx( refPos, listenerPos );
-#else
-            acousticFrontVector = VectorSubtract_fx( listenerPos, refPos );
-#endif
             BREAK;
         case IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV:
             /* ignore the height difference between listener position and reference position */
@@ -830,11 +826,7 @@ ivas_error ivas_orient_trk_SetReferenceVector_fx(
             refPosLevel.q_fact = q_min;
             move16();
 
-#ifdef FIX_954_OTR_REF_VEC
             acousticFrontVector = VectorSubtract_fx( refPosLevel, listenerPosLevel );
-#else
-            acousticFrontVector = VectorSubtract_fx( listenerPosLevel, refPosLevel );
-#endif
             BREAK;
         default:
             return IVAS_ERR_WRONG_PARAMS;
@@ -851,11 +843,7 @@ ivas_error ivas_orient_trk_SetReferenceVector_fx(
         return IVAS_ERR_WRONG_PARAMS;
     }
 
-#ifdef FIX_954_OTR_REF_VEC
     ivasForwardVector.x_fx = ONE_IN_Q31;
-#else
-    ivasForwardVector.x_fx = L_negate( ONE_IN_Q31 );
-#endif
     move32();
     ivasForwardVector.y_fx = 0;
     move32();