diff --git a/lib_com/bits_alloc_fx.c b/lib_com/bits_alloc_fx.c
index 9909f413da13f5b33d3d7ba6306817a812e1c5f5..5aea2c790268184b5b8ccb460abdc8cdb91ab442 100644
--- a/lib_com/bits_alloc_fx.c
+++ b/lib_com/bits_alloc_fx.c
@@ -420,7 +420,6 @@ static Word16 fcb_table(
     const Word16 L_subfr )
 {
     Word16 out;
-    // PMT("Not floating point computation, but fixed point operator are still missing ")
 
     out = PulseConfTable[n].bits;
     move16();
@@ -454,7 +453,6 @@ static ivas_error acelp_FCB_allocator_fx(
     Word16 *p_fixed_cdk_index;
     Word16 max_n;
     ivas_error error;
-    // PMT("Not floating point computation, but fixed point operator are still missing ")
 
     error = IVAS_ERR_OK;
     move32();
@@ -1693,7 +1691,6 @@ static Word16 allocate_unused(
     Word16 max_bit_per_pos = 0, bit_added = 0;
     move16();
     move16();
-    // PMT("Not floating point computation, but fixed point operator are still missing ")
 
     IF( prm_type == GAINSPRM )
     {
@@ -1797,7 +1794,6 @@ Word16 set_ACELP_flag(
     const Word16 cng_type       /* i  : CNG type                    */
 )
 {
-    // PMT("Not floating point computation, but fixed point operator are still missing ")
     test();
     test();
     test();
diff --git a/lib_com/fd_cng_com_fx.c b/lib_com/fd_cng_com_fx.c
index c8f0c31ac302487225d1f72345932585afb59c7e..363113f2147234d21b1f7b3542d50be23f86e324 100644
--- a/lib_com/fd_cng_com_fx.c
+++ b/lib_com/fd_cng_com_fx.c
@@ -1811,7 +1811,6 @@ void apply_scale(
 )
 {
     Word16 i;
-    // PMT("Verifiy if the basop ued are ok for stereo too")
     FOR( i = 0; i < scaleTableSize; i++ )
     {
         cast16();
@@ -1844,7 +1843,6 @@ Word16 apply_scale_ind(
 )
 {
     Word16 i;
-    // PMT("Verifiy if the basop ued are ok for stereo too")
     FOR( i = 0; i < scaleTableSize; i++ )
     {
         cast16();
@@ -1872,7 +1870,6 @@ void apply_scale_ivas_fx(
     Word16 *index )
 {
     Word16 i;
-    // PMT("Verifiy if the basop ued are ok for stereo too")
     FOR( i = 0; i < scaleTableSize; i++ )
     {
         cast16();
@@ -3137,7 +3134,6 @@ void msvq_decoder(
 {
     Word16 s, i, offset;
 
-    // PMT("msvq_decoder Not verified")
 
     offset = i_mult( Idx[0], maxN );
     FOR( i = 0; i < N; i++ )
diff --git a/lib_com/hq_tools_fx.c b/lib_com/hq_tools_fx.c
index 0e00b9428f61a9c68daa8f2a4da70847b4cc48dc..df36099a4fa057a7395ccf118873179e30755823 100644
--- a/lib_com/hq_tools_fx.c
+++ b/lib_com/hq_tools_fx.c
@@ -926,12 +926,6 @@ void ivas_harm_bwe_fx(
         {
             exp1 = add( 1, exp1 );
         }
-#ifdef DEBUGGING
-        else
-        {
-            // PMT("VERIFY if this really matches IVAS float")
-        }
-#endif
         tmp1 = s_max( tmp1, 16384 );
         tmp1 = div_s( 16384, tmp1 );
         L_tmp2 = L_deposit_h( tmp1 );
@@ -1095,12 +1089,6 @@ void harm_bwe_fx(
         {
             exp1 = add( 1, exp1 );
         }
-#ifdef DEBUGGING
-        else
-        {
-            // PMT("VERIFY if this really matches IVAS float")
-        }
-#endif
         tmp1 = s_max( tmp1, 16384 );
         tmp1 = div_s( 16384, tmp1 );        /*Q15*/
         L_tmp2 = L_deposit_h( tmp1 );       /*Q31*/
diff --git a/lib_com/tcx_mdct_window_fx.c b/lib_com/tcx_mdct_window_fx.c
index 285bbbf0a2a40d4eafaebd461083c5563c8fe440..576f5bef6a2dae5cff530d734f61e3ed10ebbd39 100644
--- a/lib_com/tcx_mdct_window_fx.c
+++ b/lib_com/tcx_mdct_window_fx.c
@@ -66,7 +66,6 @@ void mdct_window_sine_IVAS_updated(
             window[i].v.im = table[i].v.im; /* Qx */
             move16();
         }
-        // PMT("getSineWindowTable needs to be updated for IVAS")
     }
     ELSE
     {
@@ -133,7 +132,6 @@ void mdct_window_sine(
             window[i].v.im = table[i].v.im; /* Qx */
             move16();
         }
-        // PMT("getSineWindowTable needs to be updated for IVAS")
     }
 }
 
diff --git a/lib_com/tools_fx.c b/lib_com/tools_fx.c
index 1be575c2410063c75a5b55b0cc2d6a3976fcc634..5b4f0b127661a4b318c7edc0ca6c0e699cf98e0d 100644
--- a/lib_com/tools_fx.c
+++ b/lib_com/tools_fx.c
@@ -1890,7 +1890,7 @@ Word16 mean_fx(
 )
 {
     Word16 tmp;
-    // PMT("TBV : this function could be written differently to minimize the risk of saturation");
+    /* this function could be written differently to minimize the risk of saturation */
     tmp = sum16_fx( vec_fx, lvec_fx );
     tmp = mult_r( tmp, div_s( 1, lvec_fx ) );
 
diff --git a/lib_com/wi_fx.c b/lib_com/wi_fx.c
index 58f1a813dbe3dbedee9c399945703c5e18605b79..171e04269dc80ca36782f20ff2b121b782bfde9e 100644
--- a/lib_com/wi_fx.c
+++ b/lib_com/wi_fx.c
@@ -45,7 +45,6 @@ ivas_error DTFS_new_fx(
 
     DTFS_STRUCTURE *dtfs_fx = NULL;
     dtfs_fx = (DTFS_STRUCTURE *) calloc( 1, sizeof( DTFS_STRUCTURE ) );
-    // PMT("verif mem alloc")
     IF( dtfs_fx == NULL )
     {
         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTFS (SC-VBR) structure\n" ) );
@@ -3088,9 +3087,6 @@ ivas_error WIsyn_fx(
 
     /*  Adjust the phase offset and wrap it between 0 and 2pi */
 
-    // PMT("NEED a complete verification of mem flow and assignment")
-
-
     IF( EQ_16( flag, 2 ) )
     {
         L_temp = L_shr( L_mult( tmp_fx, I ), 1 ); /*  Q15 */
diff --git a/lib_dec/FEC_HQ_phase_ecu_fx.c b/lib_dec/FEC_HQ_phase_ecu_fx.c
index 4ad39acf07dc69641254ba62662576843789d78e..f79e9e4b1edd9e7e0dc61b99aa06883a5e01d6ba 100644
--- a/lib_dec/FEC_HQ_phase_ecu_fx.c
+++ b/lib_dec/FEC_HQ_phase_ecu_fx.c
@@ -750,7 +750,6 @@ static void ivas_peakfinder_fx(
         }
         ELSE
         {
-            // PMTE ()
             ii = -1; /* First point is a peak */
             move16();
             IF( GE_16( len, 2 ) )
@@ -1359,7 +1358,6 @@ static void ivas_spec_ana_fx(
         }
         ELSE
         {
-            // PMTE()
             window_corr = w_hamm[0];
             move16();
             window_corr_step = idiv1616( w_hamm[0], hamm_len2 );
@@ -1384,7 +1382,6 @@ static void ivas_spec_ana_fx(
         }
         ELSE
         {
-            // PMTE()
             window_corr = w_hamm[0];
             move16();
             window_corr_step = idiv1616( w_hamm[0], hamm_len2 );
@@ -2770,7 +2767,6 @@ static void rec_wtda_fx(
     Word16 g;
     Word16 tbl_delta;
 
-    // PMTE()
     xsubst_ = rec_buf + output_frame;
     Lprot2 = shr( Lprot, 1 );
 
@@ -4069,7 +4065,6 @@ static void ivas_fec_noise_filling_fx(
 
     const Word16 *p_mdct_ola;
     Word16 alignment_point;
-    // PMTE()
     L20 = extract_h( L_mult( 1639, L ) ); /*L/20 */
     IF( element_mode == EVS_MONO )
     {
diff --git a/lib_dec/TonalComponentDetection_fx.c b/lib_dec/TonalComponentDetection_fx.c
index bfb0b0428e6dd9b3d5413d014e0c7b08dea19ae4..093752bb704853083266223ebb8d55dd15ba7721 100644
--- a/lib_dec/TonalComponentDetection_fx.c
+++ b/lib_dec/TonalComponentDetection_fx.c
@@ -85,7 +85,6 @@ void ivas_DetectTonalComponents_fx(
     {
         nBands = FDNS_NPTS;
         move16();
-        // PMT("add nBands argument to mdct_shaping_16")
 
         mdct_shaping_16( lastMDCTSpectrum, nSamplesCore, nSamples, scaleFactors, scaleFactors_exp, scaleFactors_max_e, pScaledMdctSpectrum );
         lastMDCTSpect_exp = add( lastMDCTSpectrum_exp, scaleFactors_max_e );
diff --git a/lib_dec/amr_wb_dec_fx.c b/lib_dec/amr_wb_dec_fx.c
index 82619a87d40cbea1a5fe59aa96f72dfbb9019bac..375565f622cf9c4d1b8242617769ef5af106059b 100644
--- a/lib_dec/amr_wb_dec_fx.c
+++ b/lib_dec/amr_wb_dec_fx.c
@@ -339,9 +339,7 @@ ivas_error amr_wb_dec_fx(
         st_fx->bfi_pitch_frame = L_FRAME;
         move16();
     }
-#ifdef _DIFF_FLOAT_FIX_
-    PMT( "the code below has been removed in IVAS float (or moved somewhere else), is it ok?" )
-#endif
+
     IF( NE_16( st_fx->last_core, AMR_WB_CORE ) )
     {
         /* reset the unvoiced/audio signal improvement memories */
@@ -350,7 +348,7 @@ ivas_error amr_wb_dec_fx(
         Copy( st_fx->hAmrwb_IO->old_Aq_fx, st_fx->hAmrwb_IO->old_Aq_fx + i_mult( 2, M + 1 ), M + 1 ); /*Q12*/
         Copy( st_fx->hAmrwb_IO->old_Aq_fx, st_fx->hAmrwb_IO->old_Aq_fx + i_mult( 3, M + 1 ), M + 1 ); /*Q12*/
     }
-    /*End of _DIFF_FLOAT_FIX_*/
+
     test();
     if ( EQ_16( st_fx->last_bwidth, NB ) && st_fx->ini_frame != 0 )
     {
diff --git a/lib_dec/dec_higher_acelp_fx.c b/lib_dec/dec_higher_acelp_fx.c
index 5687f3b79073903ff34970148ea2cdeab3520cc2..c6cb34ddc10ad801c9b2ba8d870fe93d1cfa301a 100644
--- a/lib_dec/dec_higher_acelp_fx.c
+++ b/lib_dec/dec_higher_acelp_fx.c
@@ -184,7 +184,6 @@ void transf_cdbk_dec_fx(
     test();
     IF( st_fx->element_mode > EVS_MONO && ( st_fx->coder_type != INACTIVE ) && GE_32( st_fx->core_brate, MIN_BRATE_AVQ_EXC ) && LE_32( st_fx->core_brate, MAX_BRATE_AVQ_EXC_TD ) && !harm_flag_acelp && code_preQ[0] != 0 )
     {
-        // PMT("Fixed point taking accound of the scaling needs to be done here ")
         IF( GT_16( abs_s( st_fx->last_code_preq ), shl_sat( abs_s( code_preQ[0] ), 4 ) ) )
         {
             st_fx->mem_preemp_preQ_fx = shr( st_fx->mem_preemp_preQ_fx, 4 );
diff --git a/lib_dec/fd_cng_dec_fx.c b/lib_dec/fd_cng_dec_fx.c
index b1e051b61660ece6b8f62090ef054510bb8b9a20..dfbc8996f147d356eaf477807d3c38d726d53750 100644
--- a/lib_dec/fd_cng_dec_fx.c
+++ b/lib_dec/fd_cng_dec_fx.c
@@ -2510,7 +2510,6 @@ void generate_comfort_noise_dec_fx(
     /* Warning fix */
     s = 0;
     move16();
-    // PMTE(); /*IVAS CODE need to be added */
 
     /* pointer initialization */
 
@@ -3839,8 +3838,6 @@ void generate_masking_noise_fx(
     Word32 *fftBuffer;
     Word16 *seed;
 
-    // PMTE(); /*IVAS CODE need to be added */
-
     /* pointer initializations */
     cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
     fftBuffer = hFdCngCom->fftBuffer;         /*Q31 - hFdCngCom->fftBuffer_exp*/
@@ -3977,8 +3974,6 @@ void generate_masking_noise_fx(
         assert( hFdCngCom->olapBufferSynth2 != NULL );
         SynthesisSTFT( hFdCngCom->fftBuffer, fftBufferExp, maskingNoise, hFdCngCom->olapBufferSynth2, hFdCngCom->olapWinSyn,
                        0, hFdCngCom, 0, NULL, -1 /*st->element_mode*/, -1 /*nchan_out*/ );
-        // PMT("parameters need update")
-
 
         /* add some comfort noise on top of decoded signal */
         IF( hFdCngCom->frameSize > length )
@@ -4054,7 +4049,6 @@ void generate_masking_noise_mdct_fx(
     Word32 *cngNoiseLevel;
     Word16 *seed;
 
-    // PMTE(); /*IVAS CODE need to be added */
     /* pointer initializations */
     cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
     seed = &( hFdCngCom->seed );
@@ -4215,7 +4209,6 @@ void generate_masking_noise_mdct_ivas_fx(
     Word32 *cngNoiseLevel;
     Word16 *seed;
 
-    // PMTE(); /*IVAS CODE need to be added */
     /* pointer initializations */
     cngNoiseLevel = hFdCngCom->cngNoiseLevel; /*Q31 - hFdCngCom->cngNoiseLevelExp*/
     seed = &( hFdCngCom->seed );
diff --git a/lib_dec/gain_dec_fx.c b/lib_dec/gain_dec_fx.c
index e001521bf8c87f4b57d4899b2a366b76f8f4667f..f7dfbbdd740e992abb80e38453787b59cab0638f 100644
--- a/lib_dec/gain_dec_fx.c
+++ b/lib_dec/gain_dec_fx.c
@@ -35,9 +35,6 @@ void Es_pred_dec_fx(
     const Word16 no_ltp   /* i  : no LTP flag                         */
 )
 {
-#ifdef IVAS_GAIN_MOD
-    PMT( "Verify if Es_pred_dec_fx should use noltp parameters" )
-#endif
     IF( no_ltp == 0 )
     {
         SWITCH( nb_bits )
@@ -471,7 +468,6 @@ void gain_dec_mless_fx(
                 qua_table_fx = gain_qua_mless_6b_fx; /*Q14*/
                 if ( st_fx->element_mode > EVS_MONO )
                 {
-                    // PMT("gain_qua_mless_6b_stereo to fixed point")
                     qua_table_fx = gain_qua_mless_6b_stereo_fx; /*Q14*/
                 }
                 BREAK;
@@ -819,7 +815,6 @@ void gain_dec_lbr_fx(
         if ( EQ_16( nBits, 7 ) )
         {
             cdbk_fx = gp_gamma_3sfr_7b_fx; /*Q14*/
-            // PMT("verify if gp_gamma_3sfr_7b_fx is correct")
         }
 
         /* calculate predicted gain */
@@ -892,7 +887,6 @@ void gain_dec_lbr_fx(
         IF( EQ_16( nBits, 7 ) )
         {
             cdbk_fx = gp_gamma_4sfr_7b_fx; /*Q14*/
-            // PMT( "verify if gp_gamma_4sfr_7b_fx is correct" )
         }
 
         /* calculate predicted gain */
diff --git a/lib_dec/gs_dec_fx.c b/lib_dec/gs_dec_fx.c
index d174cd87bc8ee1a239450780a0411cfb8e454c4c..61fb000e46aa3ca4da37b1cddcf236c8b648015d 100644
--- a/lib_dec/gs_dec_fx.c
+++ b/lib_dec/gs_dec_fx.c
@@ -395,7 +395,6 @@ void decod_audio_fx(
                 move16();
             }
         }
-        // PMT("in the rare case of 4 subfr, bfi_pitch_fx might be wrong")
         st_fx->bfi_pitch_fx = mean_fx( pitch_buf, nb_subfr ); /* Q6 */
         move16();
         st_fx->bfi_pitch_frame = st_fx->L_frame; /* Q0 */
diff --git a/lib_dec/lsf_dec_fx.c b/lib_dec/lsf_dec_fx.c
index ec45dbae965bd56524cd22c57877730bb79a7afe..c032a745454e0057c5be537be804876b05c403cb 100644
--- a/lib_dec/lsf_dec_fx.c
+++ b/lib_dec/lsf_dec_fx.c
@@ -290,7 +290,6 @@ void lsf_dec_fx(
     test();
     IF( EQ_16( tdm_low_rate_mode, 1 ) && GT_16( coder_type, UNVOICED ) )
     {
-        // PMT("To be verified")
         IF( EQ_16( st_fx->active_cnt, 1 ) )
         {
             Copy( lsp_mid, st_fx->lsp_old_fx, M );                       /* Q15 */
diff --git a/lib_dec/peak_vq_dec_fx.c b/lib_dec/peak_vq_dec_fx.c
index 87d7e9cf3eceace20afd4016fc328a96eff25bfc..4eee76ec9bd4748f90f8164bd847ab6b83e541ce 100644
--- a/lib_dec/peak_vq_dec_fx.c
+++ b/lib_dec/peak_vq_dec_fx.c
@@ -112,7 +112,6 @@ static void peak_vq_dec_fx(
     set16_fx( pvq_inp_vector, 0, HVQ_PVQ_BUF_LEN );
 
     assert( ( core_brate > HQ_16k40 && core_brate <= HQ_48k ) && "HVQ rate not supported" );
-    // PMT("max_peaks equation needs to be converted")
     max_peaks = extract_l( Mpy_32_32( ( L_add( imult3216( core_brate, HVQ_PEAKS_PER_DELTA ), HVQ_PEAKS_PER_DELTA_OFFS ) ), 282564 ) ); /* 1 / HVQ_PEAKS_BPS_DELTA in Q31 = 282564*/
     bin_th = HVQ_THRES_BIN_24k;
     move16();
diff --git a/lib_enc/ACcontextMapping_enc_fx.c b/lib_enc/ACcontextMapping_enc_fx.c
index 051b55981dbd13839f219a50169ddb7967c7f062..cfc8ebb05104cda11d2aab31842f54997a20b42d 100644
--- a/lib_enc/ACcontextMapping_enc_fx.c
+++ b/lib_enc/ACcontextMapping_enc_fx.c
@@ -163,8 +163,7 @@ void ACcontextMapping_encode2_no_mem_s17_LC_fx(
         idx = s_min( idx1, idx2 ); /* Q0 */
 
         /* Get context */
-        ctx = &c[s_or( p1, p2 )]; /* Q0 */
-        /* _DIFF_FLOAT_FIX_  float is using t as UWord16 */
+        ctx = &c[s_or( p1, p2 )];  /* Q0 */
         t = add( *ctx, rateFlag ); /* Q0 */
         if ( GT_16( idx, nt_half ) )
         {
diff --git a/lib_enc/acelp_core_switch_enc_fx.c b/lib_enc/acelp_core_switch_enc_fx.c
index d790b1866163c7d591cee2c33517f51ac04c834b..8ef05782ba1aa644bd71a58a8f4a779030356d04 100644
--- a/lib_enc/acelp_core_switch_enc_fx.c
+++ b/lib_enc/acelp_core_switch_enc_fx.c
@@ -97,7 +97,6 @@ void acelp_core_switch_enc_fx(
         }
     }
 #ifdef FIX_I4_OL_PITCH
-    PMTE()
     IF( EQ_16( st_fx->last_codec_mode, MODE1 ) )
     {
         /* in MODE1 T_op is at 12.8 kHz */
diff --git a/lib_enc/bw_detect_fx.c b/lib_enc/bw_detect_fx.c
index 08ad0714996d0f70d30669d720a8cf2c2c946f8e..f31277e2a2b491d25373fb52b80bbf2d93a79b66 100644
--- a/lib_enc/bw_detect_fx.c
+++ b/lib_enc/bw_detect_fx.c
@@ -1007,7 +1007,6 @@ void set_bw_fx(
         test();
         IF( GT_16( element_mode, IVAS_SCE ) )
         {
-            // PMT("this IVAS_SCE section has not been verified ")
             IF( LT_32( element_brate, MIN_BRATE_SWB_STEREO ) )
             {
                 st->bwidth = WB;
diff --git a/lib_enc/cng_enc_fx.c b/lib_enc/cng_enc_fx.c
index 34be60d8a7c5b6d33502ba91b95184cbf4c4456d..fb8490127f07b9ae75402fd27b074493e8826984 100644
--- a/lib_enc/cng_enc_fx.c
+++ b/lib_enc/cng_enc_fx.c
@@ -2540,7 +2540,6 @@ static Word16 shb_DTX_fx(
     {
         att = 0;
         move16();
-        // PMT("apply_scale is not implemented")
     }
     ELSE
     {
@@ -2835,7 +2834,6 @@ static void shb_CNG_encod_ivas_fx(
         ELSE
         {
             /*idx_ener = (int16_t)(0.7f * (0.1f * st->hTdCngEnc->mov_shb_cng_ener / (float)log10(2.0f) + 6.0f) + 0.5f);*/
-            // PMT("shb_CNG_encod_fx quantization in missing")
             /* 6.0 in Q8 -> 1510 */
             /* 0.7 in Q15 22938 */
             /* ( 1 / log10(2.0) ) * 0.1 in Q15 -> 10886 */
diff --git a/lib_enc/core_enc_2div_fx.c b/lib_enc/core_enc_2div_fx.c
index fa74ec6b562f88a5e675aba13685de56fa703fdb..42e5b6a930c2cf4b9d9ccb5ac03eb3bf253f6270 100644
--- a/lib_enc/core_enc_2div_fx.c
+++ b/lib_enc/core_enc_2div_fx.c
@@ -275,7 +275,7 @@ void core_encode_twodiv_fx(
                           hTcxEnc->fUseTns[0],
                           st );
 
-        /*_DIFF_FLOAT_FIX_  -> The line below is present in float */
+        /*_DIFF_FLOAT_FIX_EVS_IVAS  -> The line below is present in float */
         // hTcxEnc->measuredBwRatio = 0x4000;
         /* Calculate target bits */
 
diff --git a/lib_enc/core_enc_init_fx.c b/lib_enc/core_enc_init_fx.c
index 2f669f09bb13af6f7f9ef45b34e23104c62de801..044821feef0c23a7d0a1909ce8594d60d5d88b7e 100644
--- a/lib_enc/core_enc_init_fx.c
+++ b/lib_enc/core_enc_init_fx.c
@@ -288,7 +288,6 @@ static void init_tcx_fx(
     (void) MCT_flag;
     (void) total_brate;
     (void) last_total_brate;
-    // PMT("init_tcx_fx needs an entire review to adapt to IVAS")
     fscaleFB = div_l( L_shl( st->input_Fs, LD_FSCALE_DENOM + 1 ), 12800 );
 
     init_TCX_config( st->hTcxCfg, st->L_frame, st->fscale, hTcxEnc->L_frameTCX, fscaleFB );
diff --git a/lib_enc/core_enc_updt_fx.c b/lib_enc/core_enc_updt_fx.c
index dcf57738a2e71e29ffe3746110370d1aa4dbc5fa..e5694fc0199f82367fb54894b14069673e8a8187 100644
--- a/lib_enc/core_enc_updt_fx.c
+++ b/lib_enc/core_enc_updt_fx.c
@@ -51,10 +51,6 @@ void core_encode_update_fx( Encoder_State *st )
     }
     /* Update previous mode */
 
-    // move16();
-    // st->last_core = st->core; /* _DIFF_FLOAT_FIX_ not in float -> remove? */
-
-
     test();
     test();
     test();
diff --git a/lib_enc/dtx_fx.c b/lib_enc/dtx_fx.c
index fa9da7f420e75fd0fa49db50cfddc897fa044bcf..265288f02961ca93cbcfcc335c3d701f31bd8358 100644
--- a/lib_enc/dtx_fx.c
+++ b/lib_enc/dtx_fx.c
@@ -272,7 +272,6 @@ void dtx_ivas_fx(
             st_fx->core_brate = SID_2k40;
             move32();
         }
-        // PMT("dtx_sce_sba code is missing")
         test();
         test();
         IF( ( ( st_fx->last_core != ACELP_CORE ) || EQ_16( st_fx->cng_type, FD_CNG ) ) && EQ_16( st_fx->dtx_sce_sba, 1 ) )
@@ -377,7 +376,6 @@ void dtx_ivas_fx(
             IF( EQ_16( st_fx->element_mode, IVAS_SCE ) )
             {
                 Word32 lp_thresh, fd_thresh;
-                // PMT( "lp_thresh scaling is to be found" )
                 test();
                 IF( st_fx->Opt_DTX_ON && EQ_16( st_fx->dtx_sce_sba, 1 ) )
                 {
diff --git a/lib_enc/enc_uv_fx.c b/lib_enc/enc_uv_fx.c
index 1a531b8bed7810dd5a1bd8abea53ff47792b24e4..0bb329f63418fdb8b9d432e529728947791a4e1a 100644
--- a/lib_enc/enc_uv_fx.c
+++ b/lib_enc/enc_uv_fx.c
@@ -356,7 +356,6 @@ void encod_unvoiced_ivas_fx(
              * Unvoiced subframe processing in two stages
              *----------------------------------------------------------------*/
 
-            // PMT("The code below needs validation, never been tested")
             /* No adaptive codebook (UC) */
             set16_fx( y1, 0, L_SUBFR );
             set16_fx( exc_fx + i_subfr, 0, L_SUBFR );
diff --git a/lib_enc/evs_enc_fx.c b/lib_enc/evs_enc_fx.c
index 3380583c09d687238d218c91cd635a18e6fe4227..08c0a88a4760ac1f324ae4781b110cd0e910354c 100644
--- a/lib_enc/evs_enc_fx.c
+++ b/lib_enc/evs_enc_fx.c
@@ -619,7 +619,6 @@ static void initFrameHeader_loc( Encoder_State *st )
     }
     ELSE
     {
-        // PMT("Frame header needs review")
         FOR( n = 0; n < FRAME_SIZE_NB; n++ )
         {
             IF( EQ_16( FrameSizeConfig[n].frame_bits, st->bits_frame_nominal ) )
diff --git a/lib_enc/ext_sig_ana_fx.c b/lib_enc/ext_sig_ana_fx.c
index 20d18c7796b4dd86b8f12380900ba14952119694..30961c591ec2640f162a42150d3c62814d330ead 100644
--- a/lib_enc/ext_sig_ana_fx.c
+++ b/lib_enc/ext_sig_ana_fx.c
@@ -110,7 +110,6 @@ void core_signal_analysis_high_bitrate_fx(
     }
     IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
     {
-        // PMT("tcx_ltp_encode_fx should be verified for IVAS")
         tcx_ltp_encode_fx( hTcxEnc->tcxltp, (Word8) st->tcxonly, hTcxEnc->tcxMode,
                            L_frame, L_SUBFR, st->speech_enc + st->encoderLookahead_enc,
                            hTcxEnc->speech_ltp + st->encoderLookahead_enc, st->speech_enc + st->encoderLookahead_enc,
diff --git a/lib_enc/fd_cng_enc_fx.c b/lib_enc/fd_cng_enc_fx.c
index 5bfb9f9acda99ee8cef452f4c0ef90af2980ff92..4f2beb8802871d9a06c4df71d90c9741f56666e9 100644
--- a/lib_enc/fd_cng_enc_fx.c
+++ b/lib_enc/fd_cng_enc_fx.c
@@ -1205,7 +1205,6 @@ void FdCng_encodeSID_fx( HANDLE_FD_CNG_ENC stenc, /* i/o: pointer to FD_CNG stru
 
     maxVal = L_add( maxVal, gain );
     maxVal = L_shl( Mpy_32_16_1( maxVal, 21771 /*0.66438561897 Q15*/ ), 1 );
-    // PMT("st must be replaced by hFdCngCom")
     sidNoiseEst_Exp = 0;
     move16();
     WHILE( maxVal >= 0 )
@@ -2213,7 +2212,6 @@ Word16 cng_energy_ivas_fx(
     test();
     IF( EQ_16( element_mode, IVAS_CPE_DFT ) || EQ_16( element_mode, IVAS_CPE_TD ) )
     {
-        // PMT(" IVAS CNG ener computing is missing")
         enr = add( enr, mult( CNG_att, FAC_LOG2_BY10_Q16 ) ); /* Q8 (7+16-15) */
     }
     ELSE IF( NE_16( bwidth, NB ) )
diff --git a/lib_enc/find_tar_fx.c b/lib_enc/find_tar_fx.c
index ca3f50f115a0fb59f9479896ecf11b78c3434f99..2d0929e045345fca273a8a9ae95772dab4a33ff8 100644
--- a/lib_enc/find_tar_fx.c
+++ b/lib_enc/find_tar_fx.c
@@ -114,7 +114,6 @@ void find_targets_fx(
     }
     h1[M] = round_fx_o( L_shl_o( Ltmp, s, &Overflow ), &Overflow ); /* Q11 + s */
 
-    // PMT("should we used extended basop here for when the L_subfr > L_SUBFR, to prevent saturation/overflow and the subsequent loop\n")
     FOR( i = M + 1; i < L_subfr; i++ )
     {
         Ltmp = L_msu( 0, Aqs[1], h1[i - 1] ); /* Q27 */
diff --git a/lib_enc/gs_enc_fx.c b/lib_enc/gs_enc_fx.c
index 76e92121bac29a2e3bbd9f1ed5c5ec0bf17beb92..43036184e6e07006c1254c1e06e4fe092305c602 100644
--- a/lib_enc/gs_enc_fx.c
+++ b/lib_enc/gs_enc_fx.c
@@ -384,7 +384,7 @@ void encod_audio_fx(
      * Updates
      *--------------------------------------------------------------------------------------*/
 
-    hLPDmem->mem_w0 = hGSCEnc->mem_w0_tmp_fx; /*_DIFF_FLOAT_FIX_  The way it is written in the original fix point is that at this point mem_w0 falls back to its original value (before enc_pit_exc, seems not the case in float */
+    hLPDmem->mem_w0 = hGSCEnc->mem_w0_tmp_fx;
     move16();
     Copy( exc_wo_nf, exc, st_fx->L_frame );
 
@@ -761,7 +761,7 @@ void encod_audio_ivas_fx(
      * Updates
      *--------------------------------------------------------------------------------------*/
     Copy_Scale_sig( &hGSCEnc->mem_w0_tmp_fx, &hLPDmem->mem_w0, 1, sub( hLPDmem->q_mem_syn, sub( Q_new, 1 ) ) );
-    /*_DIFF_FLOAT_FIX_  The way it is written in the original fix point is that at this point mem_w0 falls back to its original value (before enc_pit_exc, seems not the case in float */
+
     move16();
     Copy( exc_wo_nf, exc, st_fx->L_frame ); /* Q_new */
 
diff --git a/lib_enc/nois_est_fx.c b/lib_enc/nois_est_fx.c
index 181b1f10efdaa1b64a506e835250cf7b7f2480ab..d444952788f627197892a6d7e3ce9efdbd6a7365 100644
--- a/lib_enc/nois_est_fx.c
+++ b/lib_enc/nois_est_fx.c
@@ -1011,7 +1011,6 @@ void noise_est_fx(
             {
                 hSpMusClas->ener_RAT_fx = 0;
                 move16();
-                // PMT("hSpMusClas->ener_RAT_fx = 0, that should be validated")
             }
             ELSE
             {
diff --git a/lib_enc/peak_vq_enc_fx.c b/lib_enc/peak_vq_enc_fx.c
index bd87efb23cec3986c22e08e44636e0a08029e160..20fc9c7b8609d8cc451548770197fe06987d9a64 100644
--- a/lib_enc/peak_vq_enc_fx.c
+++ b/lib_enc/peak_vq_enc_fx.c
@@ -517,7 +517,7 @@ Word16 peak_vq_enc_fx(
 
     assert( ( core_brate > HQ_16k40 && core_brate <= HQ_48k ) && "HVQ rate not supported" );
 
-    // PMT("max_peaks equation needs to be converted")
+    /* max_peaks equation needs to be converted */
     max_peaks = (Word16) ( ( core_brate * HVQ_PEAKS_PER_DELTA + HVQ_PEAKS_PER_DELTA_OFFS ) / HVQ_PEAKS_BPS_DELTA );
 
 
diff --git a/lib_enc/qlpc_stoch_fx.c b/lib_enc/qlpc_stoch_fx.c
index 70a41378f66e8295ea6a4aa3162d177e06538846..2d7c49107b568989e174ec7c20cf247fe218944d 100644
--- a/lib_enc/qlpc_stoch_fx.c
+++ b/lib_enc/qlpc_stoch_fx.c
@@ -56,11 +56,8 @@ void lpc_quantization_fx(
 
     IF( st->lpcQuantization == 0 )
     {
-        if ( st->sr_core != 12800 )
-        {
-            // PMT("from the comment in E_LPC_isp_isf_conversion, it seems built for 12.8kHz, current sampling rate is NOT 12800, is it ok?")
-            /*_DIFF_FLOAT_FIX_ E_LPC_lsp_lsf_conversion, does it work for 16kHz as well ?*/
-        }
+        /* from the comment in E_LPC_isp_isf_conversion, it seems built for 12.8kHz only, if current sampling rate is NOT 12800, is it ok? , float takes into account Fs */
+        /* _DIFF_FLOAT_FIX_EVS_IVAS */
         E_LPC_lsp_lsf_conversion( lsp, lsf, M );
 
         /* check resonance for pitch clipping algorithm */
diff --git a/lib_enc/rst_enc_fx.c b/lib_enc/rst_enc_fx.c
index bbe32afb3605d7333c807144bbbacfb9a60a7e22..0bf82e6d39eb57584d4868d57fe0b7d18a77587a 100644
--- a/lib_enc/rst_enc_fx.c
+++ b/lib_enc/rst_enc_fx.c
@@ -42,7 +42,6 @@ void CNG_reset_enc_fx(
     set16_fx( hLPDmem->dm_fx.prev_gain_pit, 0, 6 );
     hLPDmem->dm_fx.prev_gain_code = L_deposit_l( 0 );
     hLPDmem->dm_fx.prev_state = 0;
-    // PMTE()
     move16();
 
     /* last good received frame for FEC in ACELP */
diff --git a/lib_enc/sig_clas_fx.c b/lib_enc/sig_clas_fx.c
index 78caad798f008b29eaa213f9f11c55fe575f3713..4822a5669c051e7dfb50932d93bceff4d5974d60 100644
--- a/lib_enc/sig_clas_fx.c
+++ b/lib_enc/sig_clas_fx.c
@@ -640,8 +640,7 @@ void coder_type_modif_fx(
                 hSC_VBR->vbr_generic_ho = 0;
                 move16();
             }
-        } //_DIFF_FLOAT_FIX_ see below
-          // PMT("Verify if EVS or IVAS is right about last_7k2_coder_type update")
+        }
         hSC_VBR->last_7k2_coder_type = st->coder_type;
         move16();
         test();
@@ -650,7 +649,6 @@ void coder_type_modif_fx(
             hSC_VBR->last_7k2_coder_type = GENERIC;
             move16();
         }
-        //}  closing bracket here in IVAS float, but not in EVS float. currently affects BE for switching bitrate on Linux 20220929 _DIFF_FLOAT_FIX_ !!
 
         IF( st->element_mode == 0 )
         {
diff --git a/lib_enc/swb_tbe_enc_fx.c b/lib_enc/swb_tbe_enc_fx.c
index e89c881d2758604d2f8b42645add8f2beefda826..c6c7135fc32ea5b70fea2299389bc759af671b01 100644
--- a/lib_enc/swb_tbe_enc_fx.c
+++ b/lib_enc/swb_tbe_enc_fx.c
@@ -589,13 +589,10 @@ void ResetSHBbuffer_Enc_fx(
     /* states for the filters used in generating SHB signal from SHB excitation*/
     set16_fx( hBWE_TD->state_syn_shbexc_fx, 0, L_SHB_LAHEAD );
     set16_fx( hBWE_TD->state_lpc_syn_fx, 0, LPC_SHB_ORDER );
+    set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
+    hBWE_TD->fb_tbe_demph_fx = 0;
+    move16();
 
-    // IF( EQ_16(st_fx->extl, FB_TBE))           _DIFF_FLOAT_FIX_
-    {
-        set16_fx( hBWE_TD->fb_state_lpc_syn_fx, 0, LPC_SHB_ORDER );
-        hBWE_TD->fb_tbe_demph_fx = 0;
-        move16();
-    }
     /* states for the filters used in generating WB signal from WB excitation*/
     set16_fx( hBWE_TD->decim_state1_fx, 0, 2 * ALLPASSSECTIONS_STEEP + 1 );
     set16_fx( hBWE_TD->decim_state2_fx, 0, 2 * ALLPASSSECTIONS_STEEP + 1 );
diff --git a/lib_enc/updt_enc_fx.c b/lib_enc/updt_enc_fx.c
index 9b6f80c3f26de28c7667369eb0e83af8569e3d5f..9c68847a48792d6f71496680ca90c20ac0e60fdc 100644
--- a/lib_enc/updt_enc_fx.c
+++ b/lib_enc/updt_enc_fx.c
@@ -266,7 +266,7 @@ void updt_IO_switch_enc_fx(
             hSC_VBR->nelp_mode = 0;
             move16();
         }
-        st->hGSCEnc->seed_tcx = 15687; /* the re-init here was present only in float _DIFF_FLOAT_FIX_*/
+        st->hGSCEnc->seed_tcx = 15687;
         move16();
     }
 
diff --git a/lib_enc/vad_fx.c b/lib_enc/vad_fx.c
index c4c6df6c3b4e55a8e1aa0beccac0951ecdbb63d7..77f38bf5208ac672f5f4246db5f1c3f876895671 100644
--- a/lib_enc/vad_fx.c
+++ b/lib_enc/vad_fx.c
@@ -745,16 +745,8 @@ Word16 wb_vad_fx(
         st_fx->max_band = 19;
         move16();
     }
-    /*_DIFF_FLOAT_FIX_  -> see around Ln1570, inversion in if conditions compared to float*/
-    // PMT("Error in EVS fixed point ?")
-    /*FIXED EVS */
-    /*  ELSE IF(((LE_16(st_fx->last_coder_type, UNVOICED)) && (LT_32(L_snr_outlier, MAX_SNR_OUTLIER_2_FX)) && (st_fx->Opt_SC_VBR != 0)) ||
-        ((LE_16(last_7k2_coder_type, UNVOICED)) && (LT_32(L_snr_outlier, MAX_SNR_OUTLIER_2_FX)) && (st_fx->Opt_SC_VBR == 0)))*/
 
-    /*FLOAT both IVAS and EVS */
-    /*if ((snr_outlier_index <= 4 && (st->last_coder_type > UNVOICED) && !st->Opt_SC_VBR) ||
-    (snr_outlier_index <= 4 && (last_7k2_coder_type > UNVOICED) && st->Opt_SC_VBR))*/
-    IF( 1 ) // st_fx->Opt_SC_VBR)
+    IF( 1 ) // st_fx->Opt_SC_VBR )     /* this keep 26.444 BE */
     {
         last_7k2_coder_type = st_fx->hSC_VBR->last_7k2_coder_type;
         move16();
@@ -1327,7 +1319,7 @@ Word16 wb_vad_fx(
             test();
             test();
             test();
-            test(); /*_DIFF_FLOAT_FIX_  -> the conditions around Opt_SC_VBR_fx are invertered compared to float
+            test(); /*_DIFF_FLOAT_FIX_EVS  -> the conditions around Opt_SC_VBR_fx are invertered compared to float
                                            ### st_fx->Opt_SC_VBR!=0 vs !st_fx->Opt_SC_VBR #####*/
             // test();
             IF( LE_16( snr_outlier_index, 4 ) && ( ( GT_16( st_fx->last_coder_type, UNVOICED ) && ( st_fx->Opt_SC_VBR != 0 ) ) ||
@@ -1730,7 +1722,7 @@ Word16 wb_vad_fx(
 
 
     /* *flag_noisy_speech_snr is a  Word8 parameter  */
-    *flag_noisy_speech_snr = 0; /*_DIFF_FLOAT_FIX_ -> this initialisation is not done here in float */
+    *flag_noisy_speech_snr = 0; /*_DIFF_FLOAT_FIX_IVAS -> this initialisation is not done here in float */
     move16();
     IF( vad_bwidth_fx != NB )
     {
@@ -2593,8 +2585,7 @@ Word16 wb_vad_ivas_fx(
             test();
             test();
             test();
-            test(); /*_DIFF_FLOAT_FIX_  -> the conditions around Opt_SC_VBR_fx are invertered compared to float
-                                           ### st_fx->Opt_SC_VBR!=0 vs !st_fx->Opt_SC_VBR #####*/
+            test();
             test();
             IF( ( LE_16( snr_outlier_index, 4 ) && ( st_fx->last_coder_type > UNVOICED ) && !st_fx->Opt_SC_VBR ) ||
                 ( LE_16( snr_outlier_index, 4 ) && ( last_7k2_coder_type > UNVOICED ) && st_fx->Opt_SC_VBR ) )
@@ -3006,7 +2997,7 @@ Word16 wb_vad_ivas_fx(
 
 
     /* *flag_noisy_speech_snr is a  Word8 parameter  */
-    *flag_noisy_speech_snr = 0; /*_DIFF_FLOAT_FIX_ -> this initialisation is not done here in float */
+    *flag_noisy_speech_snr = 0; /*_DIFF_FLOAT_FIX_IVAS -> this initialisation is not done here in float */
     move16();
     IF( vad_bwidth_fx != NB )
     {