diff --git a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc
index b67ec8a3a..2def04c75 100644
--- a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc
@@ -19,9 +19,8 @@
 #include "gnss_sdr_string_literals.h"
 #include "gnss_sdr_valve.h"
 #include <gnuradio/blocks/copy.h>
-#include <string>
+#include <cstdlib>
 #include <unordered_set>
-#include <vector>
 
 #if USE_GLOG_AND_GFLAGS
 #include <glog/logging.h>
@@ -59,7 +58,6 @@ IONGSMSSignalSource::IONGSMSSignalSource(const ConfigurationInterface* configura
     : SignalSourceBase(configuration, role, "ION_GSMS_Signal_Source"s),
       stream_ids_(parse_comma_list(configuration->property(role + ".streams"s, ""s))),
       metadata_filepath_(configuration->property(role + ".metadata_filename"s, "../data/example_capture_metadata.sdrx"s)),
-      timestamp_clock_offset_ms_(configuration->property(role + ".timestamp_clock_offset_ms"s, 0.0)),
       in_streams_(in_streams),
       out_streams_(out_streams)
 {
@@ -88,6 +86,7 @@ IONGSMSSignalSource::IONGSMSSignalSource(const ConfigurationInterface* configura
         }
 }
 
+
 void IONGSMSSignalSource::load_metadata()
 {
     try
@@ -117,6 +116,7 @@ void IONGSMSSignalSource::load_metadata()
         }
 }
 
+
 std::vector<IONGSMSFileSource::sptr> IONGSMSSignalSource::make_stream_sources(const std::vector<std::string>& stream_ids) const
 {
     std::vector<IONGSMSFileSource::sptr> sources{};
@@ -180,6 +180,7 @@ std::vector<IONGSMSFileSource::sptr> IONGSMSSignalSource::make_stream_sources(co
     return sources;
 }
 
+
 void IONGSMSSignalSource::connect(gr::top_block_sptr top_block)
 {
     std::size_t cumulative_index = 0;
diff --git a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h
index 31d0f7815..fd0a5140c 100644
--- a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef GNSS_SDR_ION_METADATA_STANDARD_SIGNAL_SOURCE_H
-#define GNSS_SDR_ION_METADATA_STANDARD_SIGNAL_SOURCE_H
+#ifndef GNSS_SDR_ION_GSMS_SIGNAL_SOURCE_H
+#define GNSS_SDR_ION_GSMS_SIGNAL_SOURCE_H
 
 #include "configuration_interface.h"
 #include "file_source_base.h"
@@ -73,7 +73,6 @@ private:
 
     gnss_shared_ptr<Gnss_Sdr_Timestamp> timestamp_block_;
     std::string timestamp_file_;
-    double timestamp_clock_offset_ms_;
 
     uint32_t in_streams_;
     uint32_t out_streams_;
@@ -82,4 +81,4 @@ private:
 
 /** \} */
 /** \} */
-#endif  // GNSS_SDR_ION_METADATA_STANDARD_SIGNAL_SOURCE_H
+#endif  // GNSS_SDR_ION_GSMS_SIGNAL_SOURCE_H
diff --git a/src/algorithms/signal_source/gnuradio_blocks/ion_gsms.h b/src/algorithms/signal_source/gnuradio_blocks/ion_gsms.h
index c82726b85..4a6baa7e9 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/ion_gsms.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/ion_gsms.h
@@ -14,8 +14,8 @@
  * -----------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_ION_GNSS_SDR_METADATA_STANDARD_H
-#define GNSS_SDR_ION_GNSS_SDR_METADATA_STANDARD_H
+#ifndef GNSS_SDR_ION_GSMS_H
+#define GNSS_SDR_ION_GSMS_H
 
 #include "gnss_block_interface.h"
 #include "gnss_sdr_filesystem.h"
@@ -30,7 +30,7 @@
 
 /** \addtogroup Signal_Source
  * \{ */
-/** \addtogroup Signal_Source_libs
+/** \addtogroup Signal_Source_gnuradio_blocks
  * \{ */
 
 class IONGSMSFileSource : public gr::sync_block
@@ -71,4 +71,4 @@ private:
 
 /** \} */
 /** \} */
-#endif  // GNSS_SDR_ION_GNSS_SDR_METADATA_STANDARD_H
+#endif  // GNSS_SDR_ION_GSMS_H