diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.cc b/src/core/system_parameters/glonass_gnav_navigation_message.cc
index d30f6057f..9d3510fdf 100644
--- a/src/core/system_parameters/glonass_gnav_navigation_message.cc
+++ b/src/core/system_parameters/glonass_gnav_navigation_message.cc
@@ -29,18 +29,6 @@
 #endif
 
 
-Glonass_Gnav_Navigation_Message::Glonass_Gnav_Navigation_Message()
-{
-    auto gnss_sat = Gnss_Satellite();
-    std::string _system("GLONASS");
-    // TODO SHould number of channels be hardcoded?
-    for (uint32_t i = 1; i < 14; i++)
-        {
-            satelliteBlock[i] = gnss_sat.what_block(_system, i);
-        }
-}
-
-
 bool Glonass_Gnav_Navigation_Message::CRC_test(std::bitset<GLONASS_GNAV_STRING_BITS>& bits) const
 {
     uint32_t sum_bits = 0;
diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.h b/src/core/system_parameters/glonass_gnav_navigation_message.h
index c51264ad8..29b0ae2b2 100644
--- a/src/core/system_parameters/glonass_gnav_navigation_message.h
+++ b/src/core/system_parameters/glonass_gnav_navigation_message.h
@@ -27,7 +27,6 @@
 #include "glonass_gnav_utc_model.h"
 #include <bitset>
 #include <cstdint>
-#include <map>
 #include <string>
 #include <utility>  // for pair
 #include <vector>   // for vector
@@ -49,7 +48,7 @@ public:
     /*!
      * Default constructor
      */
-    Glonass_Gnav_Navigation_Message();
+    Glonass_Gnav_Navigation_Message() = default;
 
     /*!
      * \brief Compute CRC for GLONASS GNAV strings
@@ -178,8 +177,6 @@ private:
     Glonass_Gnav_Utc_Model gnav_utc_model{};                   // UTC model information
     Glonass_Gnav_Almanac gnav_almanac[GLONASS_CA_NBR_SATS]{};  // Almanac information for all 24 satellites
 
-    std::map<int, std::string> satelliteBlock;  // Map that stores to which block the PRN belongs
-
     double d_previous_tb{};                       // Previous iode for the Glonass_Gnav_Ephemeris object. Used to determine when new data arrives
     double d_previous_Na[GLONASS_CA_NBR_SATS]{};  // Previous time for almanac of the Glonass_Gnav_Almanac object