diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index 821009d47..a8d0e244e 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -38,12 +38,11 @@ target_link_libraries(front_end_cal_lib
         core_receiver
         core_libs
     PRIVATE
+        Boost::boost
         Gflags::gflags
         Glog::glog
         Gnuradio::blocks
         Gnuradio::runtime
-        Boost::serialization
-        Boost::thread
 )
 
 if(ENABLE_CLANG_TIDY)
@@ -65,8 +64,9 @@ target_link_libraries(front-end-cal
         front_end_cal_lib
         gnss_sdr_flags
     PRIVATE
+        Boost::filesystem
+        Gflags::gflags
         Glog::glog
-        Armadillo::armadillo
 )
 
 target_compile_definitions(front-end-cal
diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc
index 32f8da6aa..58e38e067 100644
--- a/src/utils/front-end-cal/front_end_cal.cc
+++ b/src/utils/front-end-cal/front_end_cal.cc
@@ -38,10 +38,7 @@
 #include "gps_iono.h"
 #include "gps_navigation_message.h"
 #include "gps_utc_model.h"
-#include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <glog/logging.h>
 #include <cmath>
 #include <exception>
diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc
index cc36ce147..6d9380cb4 100644
--- a/src/utils/front-end-cal/main.cc
+++ b/src/utils/front-end-cal/main.cc
@@ -57,7 +57,6 @@
 #include <boost/exception/detail/exception_ptr.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/thread.hpp>
 #include <glog/logging.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/file_source.h>
@@ -73,6 +72,7 @@
 #include <exception>
 #include <memory>
 #include <queue>
+#include <thread>
 #include <utility>
 #include <vector>
 
@@ -398,7 +398,7 @@ int main(int argc, char** argv)
     std::map<int, double> doppler_measurements_map;
     std::map<int, double> cn0_measurements_map;
 
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     // record startup time
     std::chrono::time_point<std::chrono::system_clock> start, end;
@@ -417,9 +417,9 @@ int main(int argc, char** argv)
             stop = false;
             try
                 {
-                    ch_thread = boost::thread(wait_message);
+                    ch_thread = std::thread(wait_message);
                 }
-            catch (const boost::thread_resource_error& e)
+            catch (const std::exception& e)
                 {
                     LOG(INFO) << "Exception caught (thread resource error)";
                 }
@@ -457,7 +457,7 @@ int main(int argc, char** argv)
                 {
                     ch_thread.join();
                 }
-            catch (const boost::thread_resource_error& e)
+            catch (const std::exception& e)
                 {
                     LOG(INFO) << "Exception caught while joining threads.";
                 }