diff --git a/core/data_provider/SubstreamSelector.cpp b/core/data_provider/SubstreamSelector.cpp
index 3541a6353..c9d5c213b 100644
--- a/core/data_provider/SubstreamSelector.cpp
+++ b/core/data_provider/SubstreamSelector.cpp
@@ -28,16 +28,15 @@ SubstreamSelector::SubstreamSelector(const std::set<vrs::StreamId>& allStreamIds
 }
 
 /* info about available streams */
-const std::set<vrs::StreamId> SubstreamSelector::getStreamIds() const {
+std::set<vrs::StreamId> SubstreamSelector::getStreamIds() const {
   return allStreamIds_;
 }
 
-const std::set<vrs::RecordableTypeId> SubstreamSelector::getTypeIds() const {
+std::set<vrs::RecordableTypeId> SubstreamSelector::getTypeIds() const {
   return typeIds_;
 }
 
-const std::set<vrs::StreamId> SubstreamSelector::getStreamIds(
-    const vrs::RecordableTypeId& typeId) const {
+std::set<vrs::StreamId> SubstreamSelector::getStreamIds(const vrs::RecordableTypeId& typeId) const {
   return typeIdToStreamIds_.at(typeId);
 }
 
@@ -47,7 +46,7 @@ bool SubstreamSelector::isActive(const vrs::StreamId& streamId) const {
   return selectedStreamIds_.count(streamId);
 }
 
-const std::set<vrs::StreamId> SubstreamSelector::getActiveStreamIds() const {
+std::set<vrs::StreamId> SubstreamSelector::getActiveStreamIds() const {
   return selectedStreamIds_;
 }
 
diff --git a/core/data_provider/SubstreamSelector.h b/core/data_provider/SubstreamSelector.h
index 354158570..7cdeef682 100644
--- a/core/data_provider/SubstreamSelector.h
+++ b/core/data_provider/SubstreamSelector.h
@@ -33,18 +33,18 @@ class SubstreamSelector {
   /**
    * @brief Returns the list of available stream ids
    */
-  const std::set<vrs::StreamId> getStreamIds() const;
+  std::set<vrs::StreamId> getStreamIds() const;
   /**
    * @brief Returns the list of available type ids
    */
 
-  const std::set<vrs::RecordableTypeId> getTypeIds() const;
+  std::set<vrs::RecordableTypeId> getTypeIds() const;
   /**
    * @brief Returns the list of stream ids of a specified type
    * @param typeId the ID of a VRS recordable type e.g. vrs::RecordableTypeId::SlamCameraData
    */
 
-  const std::set<vrs::StreamId> getStreamIds(const vrs::RecordableTypeId& typeId) const;
+  std::set<vrs::StreamId> getStreamIds(const vrs::RecordableTypeId& typeId) const;
 
   /* info about selected streams */
 
@@ -57,7 +57,7 @@ class SubstreamSelector {
    * @brief Returns all selected streams
    */
 
-  const std::set<vrs::StreamId> getActiveStreamIds() const;
+  std::set<vrs::StreamId> getActiveStreamIds() const;
 
   /* toggle streams on or off */
   /**
diff --git a/core/data_provider/VrsDataProvider.cpp b/core/data_provider/VrsDataProvider.cpp
index 3ecba2a4d..ce28e3110 100644
--- a/core/data_provider/VrsDataProvider.cpp
+++ b/core/data_provider/VrsDataProvider.cpp
@@ -144,7 +144,7 @@ MotionConfigRecord VrsDataProvider::getMagnetometerConfiguration(
  random access interfaces
  *******************************/
 /* get dimension of data */
-const std::set<vrs::StreamId> VrsDataProvider::getAllStreams() const {
+std::set<vrs::StreamId> VrsDataProvider::getAllStreams() const {
   return interface_->getStreamIds();
 }
 
diff --git a/core/data_provider/VrsDataProvider.h b/core/data_provider/VrsDataProvider.h
index bd687f160..101b20621 100644
--- a/core/data_provider/VrsDataProvider.h
+++ b/core/data_provider/VrsDataProvider.h
@@ -49,7 +49,7 @@ class VrsDataProvider {
    * @brief Get all available streams from the vrs file.
    * @return A set of streamIds.
    */
-  const std::set<vrs::StreamId> getAllStreams() const;
+  std::set<vrs::StreamId> getAllStreams() const;
 
   /**
    * @brief Get the tags map for all the underlying files. Does not include any stream tags.
diff --git a/projects/AriaDigitalTwinDatasetTools/data_provider/AriaDigitalTwinDataProvider.h b/projects/AriaDigitalTwinDatasetTools/data_provider/AriaDigitalTwinDataProvider.h
index e146e0e51..72f6bc084 100644
--- a/projects/AriaDigitalTwinDatasetTools/data_provider/AriaDigitalTwinDataProvider.h
+++ b/projects/AriaDigitalTwinDatasetTools/data_provider/AriaDigitalTwinDataProvider.h
@@ -315,18 +315,16 @@ class AriaDigitalTwinDataProvider {
 
   // ---- Getter of all stored data provider pointers within ADTDataProvider----
   // Also provide API to the core data provider itself.
-  const std::shared_ptr<const tools::data_provider::VrsDataProvider> rawDataProviderPtr() const {
+  std::shared_ptr<const tools::data_provider::VrsDataProvider> rawDataProviderPtr() const {
     return dataProvider_;
   }
-  const std::shared_ptr<const tools::data_provider::VrsDataProvider> segmentationDataProviderPtr()
-      const {
+  std::shared_ptr<const tools::data_provider::VrsDataProvider> segmentationDataProviderPtr() const {
     return segmentationProvider_;
   }
-  const std::shared_ptr<const tools::data_provider::VrsDataProvider> depthDataProviderPtr() const {
+  std::shared_ptr<const tools::data_provider::VrsDataProvider> depthDataProviderPtr() const {
     return depthImageProvider_;
   }
-  const std::shared_ptr<const tools::data_provider::VrsDataProvider> syntheticDataProviderPtr()
-      const {
+  std::shared_ptr<const tools::data_provider::VrsDataProvider> syntheticDataProviderPtr() const {
     return syntheticVrsProvider_;
   }
   std::shared_ptr<tools::mps::MpsDataProvider> mpsDataProviderPtr() {