diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h
index e28fdd087..209ba88d7 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h
@@ -197,7 +197,6 @@ private:
     volk_gnsssdr::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     std::weak_ptr<ChannelFsm> channel_fsm_;
     Gnss_Synchro* gnss_synchro_;
-    const ConfigurationInterface* configuration_;
     Acq_Conf_Fpga acq_parameters_;
     std::string role_;
     int64_t fs_in_;
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h
index 9968ccd72..9f9170c40 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h
@@ -204,7 +204,6 @@ private:
     std::weak_ptr<ChannelFsm> channel_fsm_;
     volk_gnsssdr::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     Gnss_Synchro* gnss_synchro_;
-    const ConfigurationInterface* configuration_;
     Acq_Conf_Fpga acq_parameters_;
     std::string role_;
     int64_t fs_in_;
diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h
index 6e7403906..e3c43aeea 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h
@@ -204,7 +204,6 @@ private:
     std::weak_ptr<ChannelFsm> channel_fsm_;
 
     Gnss_Synchro* gnss_synchro_;
-    const ConfigurationInterface* configuration_;
     Acq_Conf_Fpga acq_parameters_;
     std::string role_;
     int64_t fs_in_;
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
index 5cb8728d6..addbdd5ec 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
@@ -202,7 +202,6 @@ private:
     std::weak_ptr<ChannelFsm> channel_fsm_;
     volk_gnsssdr::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     Gnss_Synchro* gnss_synchro_;
-    const ConfigurationInterface* configuration_;
     Acq_Conf_Fpga acq_parameters_;
     std::string role_;
     int64_t fs_in_;
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
index 771607f88..30680e011 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
@@ -22,7 +22,6 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_fft.h"
 #include "gnss_sdr_flags.h"
-#include "gnss_synchro.h"
 #include "gps_l2c_signal_replica.h"
 #include <glog/logging.h>
 #include <gnuradio/gr_complex.h>  // for gr_complex
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
index 7fb6bbc9f..67f8f621a 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
@@ -22,6 +22,7 @@
 
 #include "acq_conf_fpga.h"
 #include "channel_fsm.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
 #include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
 #include <volk_gnsssdr/volk_gnsssdr_alloc.h>
@@ -35,7 +36,6 @@
  * \{ */
 
 
-class Gnss_Synchro;
 class ConfigurationInterface;
 
 /*!
@@ -164,7 +164,6 @@ private:
     volk_gnsssdr::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     std::weak_ptr<ChannelFsm> channel_fsm_;
     Gnss_Synchro* gnss_synchro_;
-    const ConfigurationInterface* configuration_;
     Acq_Conf_Fpga acq_parameters_;
     std::string role_;
     int64_t fs_in_;
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h
index 5a700d34f..a2e69c3df 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h
@@ -204,7 +204,6 @@ private:
     std::weak_ptr<ChannelFsm> channel_fsm_;
     volk_gnsssdr::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     Gnss_Synchro* gnss_synchro_;
-    const ConfigurationInterface* configuration_;
     Acq_Conf_Fpga acq_parameters_;
     std::string role_;
     int64_t fs_in_;
diff --git a/src/algorithms/acquisition/libs/acq_conf_fpga.cc b/src/algorithms/acquisition/libs/acq_conf_fpga.cc
index 93cf6dc28..94d9a321f 100644
--- a/src/algorithms/acquisition/libs/acq_conf_fpga.cc
+++ b/src/algorithms/acquisition/libs/acq_conf_fpga.cc
@@ -34,7 +34,6 @@ void Acq_Conf_Fpga::SetFromConfiguration(const ConfigurationInterface *configura
 
     // downsampling factor
     uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", downs_factor);
-    downsampling_factor = downsampling_factor;
     fs_in = fs_in / downsampling_factor;
 
     // code length in samples