diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h
index 0e829e59ba926579b09a14ca5d99ffdea6193729..40086183d77af30f3b65cee59d3787d003c40497 100644
--- a/lib_com/prot_fx.h
+++ b/lib_com/prot_fx.h
@@ -388,8 +388,7 @@ void SWB_BWE_decoding_fx(
     Word16 *prev_weight,         /* i/o: excitation weight value of last frame */
     const Word16 extl,           /* i  : extension layer                       */
     Word16 Q_syn,
-    const Word16 last_extl, /* i  : extension layer of last frame         */
-    Word16 element_mode     /* i  : element mode  */
+    const Word16 last_extl /* i  : extension layer of last frame         */
 );
 
 void time_envelop_shaping_fx(
@@ -2719,8 +2718,7 @@ void SWB_BWE_decoding_fx(
     Word16 *prev_weight,         /* i/o: excitation weight value of last frame */
     const Word16 extl,           /* i  : extension layer                       */
     Word16 Q_syn,
-    const Word16 last_extl, /* i  : extension layer of last frame         */
-    Word16 element_mode     /* i  : element mode  */
+    const Word16 last_extl /* i  : extension layer of last frame         */
 );
 
 void time_envelop_shaping_fx(
diff --git a/lib_com/swb_bwe_com_fx.c b/lib_com/swb_bwe_com_fx.c
index dd0c8aa301f34dc8f9b2df4d4f3e8f171bb61678..bd22e7e4259ec48ffc7a2626da5143c2fec263bc 100644
--- a/lib_com/swb_bwe_com_fx.c
+++ b/lib_com/swb_bwe_com_fx.c
@@ -1377,8 +1377,7 @@ void SWB_BWE_decoding_fx(
     Word16 *prev_weight,         /* i/o: excitation weight value of last frame */
     const Word16 extl,           /* i  : extension layer                       */
     Word16 Q_syn,
-    const Word16 last_extl, /* i  : extension layer of last frame         */
-    Word16 element_mode     /* i  : element mode                          */
+    const Word16 last_extl /* i  : extension layer of last frame         */
 )
 {
     Word16 n_freq, n_band, L, L_swb_norm;
@@ -1457,7 +1456,7 @@ void SWB_BWE_decoding_fx(
 #ifdef BASOP_NOGLOB
         EnergyL_16 = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /* Q3 */
 #else
-        EnergyL_16 = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) );          /* Q3 */
+        EnergyL_16 = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) );                                          /* Q3 */
 #endif
     }
     calc_normal_length_fx( ACELP_CORE, core_dec_freq, mode, extl, &L_swb_norm, prev_L_swb_norm, Q_syn );
@@ -1514,8 +1513,8 @@ void SWB_BWE_decoding_fx(
                 L_tmp = L_mult_sat( SWB_signal[n_freq], SWB_signal[n_freq] ); /*Q31 */
                 energy = L_add_sat( energy, L_shr( L_tmp, 6 ) );              /*Q25 */
 #else
-                L_tmp = L_mult( SWB_signal[n_freq], SWB_signal[n_freq] ); /*Q31 */
-                energy = L_add( energy, L_shr( L_tmp, 6 ) );              /*Q25 */
+                L_tmp = L_mult( SWB_signal[n_freq], SWB_signal[n_freq] );                                 /*Q31 */
+                energy = L_add( energy, L_shr( L_tmp, 6 ) );                                              /*Q25 */
 #endif
             }
 
@@ -1581,22 +1580,12 @@ void SWB_BWE_decoding_fx(
         exp = norm_s( SWB_FENV );
         tmp = div_s( shl( 1, sub( 14, exp ) ), SWB_FENV ); /*Q(29-exp) */
         L_tmp = Mult_32_16( L_energy, tmp );               /*Q(1+29-exp+1)->Q(15-exp) */
-        IF( EQ_16( element_mode, EVS_MONO ) )
-        {
-#ifdef BASOP_NOGLOB
-            Energy_16 = round_fx_sat( L_shl_sat( L_tmp, add( exp, 4 ) ) );
-#else
-            EnergyL_16 = round_fx( L_shl( L_tmp, add( exp, 4 ) ) );
-#endif
-        }
-        ELSE
-        {
+
 #ifdef BASOP_NOGLOB
-            EnergyL_16 = round_fx_sat( L_shl_sat( L_tmp, add( exp, 4 ) ) ); /* Q3 */
+        Energy_16 = round_fx_sat( L_shl_sat( L_tmp, add( exp, 4 ) ) ); /* Q3 */
 #else
-            Energy_16 = round_fx( L_shl( L_tmp, add( exp, 4 ) ) );                                        /*Q3 */
+        Energy_16 = round_fx( L_shl( L_tmp, add( exp, 4 ) ) );                                            /*Q3 */
 #endif
-        }
 
         test();
         IF( NE_16( last_extl, SWB_BWE ) && NE_16( last_extl, FB_BWE ) )
diff --git a/lib_dec/swb_bwe_dec.c b/lib_dec/swb_bwe_dec.c
index 90a2a0130ca91853e5176a91345515fcaf50ffec..1dcc5c111603f6ac4fbb50eeb0838ddcfc83d865 100644
--- a/lib_dec/swb_bwe_dec.c
+++ b/lib_dec/swb_bwe_dec.c
@@ -473,11 +473,11 @@ Word16 swb_bwe_dec_fx32(
 
     IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
     {
-        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl, st_fx->element_mode );
+        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
     }
     ELSE
     {
-        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl, st_fx->element_mode );
+        SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
     }
 
     test();
diff --git a/lib_dec/swb_bwe_dec_fx.c b/lib_dec/swb_bwe_dec_fx.c
index f2d51f26cb65a9f53f9c4db998d5ac6ea4f17e01..cd30df7c3fdb908afabc134c83b9814da2cfaabf 100644
--- a/lib_dec/swb_bwe_dec_fx.c
+++ b/lib_dec/swb_bwe_dec_fx.c
@@ -1071,13 +1071,12 @@ Word16 swb_bwe_dec_fx( /*o :Q_syn_hb*/
     IF( EQ_16( st_fx->L_frame, L_FRAME16k ) )
     {
         SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, ysynth_32, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx,
-                             &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl, st_fx->element_mode );
+                             &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
     }
     ELSE
     {
         SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, ysynth_32, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx,
-                             &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn,
-                             st_fx->last_extl, st_fx->element_mode );
+                             &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl );
     }
 
     test();