diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
index 42dd65633..de4e1e332 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
@@ -40,9 +40,6 @@
 #include "tracking_discriminators.h"
 #include "CN_estimators.h"
 #include "GPS_L1_CA.h"
-#ifdef GNSS_SDR_USE_BOOST_ROUND
-#include <boost/math/special_functions/round.hpp>
-#endif
 #include "control_message_factory.h"
 #include <boost/lexical_cast.hpp>
 #include <iostream>
@@ -209,11 +206,7 @@ void Gps_L1_Ca_Dll_Pll_Tracking_cc::start_tracking()
     T_prn_mod_seconds = T_chip_mod_seconds * GPS_L1_CA_CODE_LENGTH_CHIPS;
     T_prn_mod_samples = T_prn_mod_seconds * (float)d_fs_in;
 
-#ifdef GNSS_SDR_USE_BOOST_ROUND
     d_next_prn_length_samples = round(T_prn_mod_samples);
-#else
-    d_next_prn_length_samples = std::round(T_prn_mod_samples);
-#endif
 
     float T_prn_true_seconds = GPS_L1_CA_CODE_LENGTH_CHIPS / GPS_L1_CA_CODE_RATE_HZ;
     float T_prn_true_samples = T_prn_true_seconds * (float)d_fs_in;
@@ -281,7 +274,6 @@ void Gps_L1_Ca_Dll_Pll_Tracking_cc::update_local_code()
     tcode_chips = -rem_code_phase_chips;
     for (int i=0; i<d_current_prn_length_samples; i++)
         {
-#ifdef GNSS_SDR_USE_BOOST_ROUND
             associated_chip_index = 1 + round(fmod(tcode_chips - d_early_late_spc_chips, code_length_chips));
             d_early_code[i] = d_ca_code[associated_chip_index];
             associated_chip_index = 1 + round(fmod(tcode_chips, code_length_chips));
@@ -289,15 +281,6 @@ void Gps_L1_Ca_Dll_Pll_Tracking_cc::update_local_code()
             associated_chip_index = 1 + round(fmod(tcode_chips+d_early_late_spc_chips, code_length_chips));
             d_late_code[i] = d_ca_code[associated_chip_index];
             tcode_chips = tcode_chips + d_code_phase_step_chips;
-#else
-            associated_chip_index = 1 + std::round(fmod(tcode_chips - d_early_late_spc_chips, code_length_chips));
-            d_early_code[i] = d_ca_code[associated_chip_index];
-            associated_chip_index = 1 + std::round(fmod(tcode_chips, code_length_chips));
-            d_prompt_code[i] = d_ca_code[associated_chip_index];
-            associated_chip_index = 1 + std::round(fmod(tcode_chips+d_early_late_spc_chips, code_length_chips));
-            d_late_code[i] = d_ca_code[associated_chip_index];
-            tcode_chips = tcode_chips + d_code_phase_step_chips;
-#endif
         }
 }
 
@@ -372,11 +355,7 @@ int Gps_L1_Ca_Dll_Pll_Tracking_cc::general_work (int noutput_items, gr_vector_in
                     acq_to_trk_delay_samples = d_sample_counter - d_acq_sample_stamp;
                     acq_trk_shif_correction_samples = d_next_prn_length_samples - fmod((float)acq_to_trk_delay_samples, (float)d_next_prn_length_samples);
                     //std::cout<<"acq_trk_shif_correction="<<acq_trk_shif_correction_samples<<"\r\n";
-#ifdef GNSS_SDR_USE_BOOST_ROUND
                     samples_offset = round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
-#else
-                    samples_offset = std::round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
-#endif
                     // /todo: Check if the sample counter sent to the next block as a time reference should be incremented AFTER sended or BEFORE
                     d_sample_counter_seconds = d_sample_counter_seconds + (((double)samples_offset) / (double)d_fs_in);
                     d_sample_counter = d_sample_counter + samples_offset; //count for the processed samples
@@ -473,11 +452,7 @@ int Gps_L1_Ca_Dll_Pll_Tracking_cc::general_work (int noutput_items, gr_vector_in
                 }
 
             d_code_phase_samples = fmod(d_code_phase_samples, T_prn_true_samples);
-#ifdef GNSS_SDR_USE_BOOST_ROUND
             d_next_prn_length_samples = round(K_blk_samples); //round to a discrete samples
-#else
-            d_next_prn_length_samples = std::round(K_blk_samples); //round to a discrete samples
-#endif
             d_next_rem_code_phase_samples = K_blk_samples - d_next_prn_length_samples; //rounding error
 
             /*!