diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
index 2d4f674a65920d..8c9515738fa7da 100644
--- a/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
+++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
@@ -54,7 +54,7 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp
 public:
     static const StaticSupportedModesManager instance;
 
-    const SupportedModesManager::ModeOptionsProvider getModeOptionsProvider(EndpointId endpointId) const override;
+    SupportedModesManager::ModeOptionsProvider getModeOptionsProvider(EndpointId endpointId) const override;
 
     EmberAfStatus getModeOptionByMode(EndpointId endpointId, uint8_t mode, const ModeOptionStructType ** dataPtr) const override;
 
diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
index 8308ab8538de17..c9f118464c27ae 100644
--- a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
+++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
@@ -39,7 +39,7 @@ const StaticSupportedModesManager::EndpointSpanPair
 
 const StaticSupportedModesManager StaticSupportedModesManager::instance = StaticSupportedModesManager();
 
-const SupportedModesManager::ModeOptionsProvider StaticSupportedModesManager::getModeOptionsProvider(EndpointId endpointId) const
+SupportedModesManager::ModeOptionsProvider StaticSupportedModesManager::getModeOptionsProvider(EndpointId endpointId) const
 {
     for (auto & endpointSpanPair : supportedOptionsByEndpoints)
     {
diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
index c5edba6c3dd19f..3419ec227b956d 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.cpp
+++ b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -48,8 +48,7 @@ const chip::Credentials::AttestationTrustStore * CHIPCommand::sTrustStore = null
 chip::Credentials::GroupDataProviderImpl CHIPCommand::sGroupDataProvider{ kMaxGroupsPerFabric, kMaxGroupKeysPerFabric };
 
 namespace {
-const CHIP_ERROR GetAttestationTrustStore(const char * paaTrustStorePath,
-                                          const chip::Credentials::AttestationTrustStore ** trustStore)
+CHIP_ERROR GetAttestationTrustStore(const char * paaTrustStorePath, const chip::Credentials::AttestationTrustStore ** trustStore)
 {
     if (paaTrustStorePath == nullptr)
     {
diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
index 0c6fe3051f26a8..359ef83a26a9a2 100644
--- a/src/app/util/attribute-storage.cpp
+++ b/src/app/util/attribute-storage.cpp
@@ -1015,7 +1015,7 @@ const EmberAfCluster * emberAfGetClusterByIndex(EndpointId endpoint, uint8_t clu
     return &(definedEndpoint->endpointType->cluster[clusterIndex]);
 }
 
-const chip::Span<const EmberAfDeviceType> emberAfDeviceTypeListFromEndpoint(chip::EndpointId endpoint, CHIP_ERROR & err)
+chip::Span<const EmberAfDeviceType> emberAfDeviceTypeListFromEndpoint(chip::EndpointId endpoint, CHIP_ERROR & err)
 {
     uint16_t endpointIndex = emberAfIndexFromEndpoint(endpoint);
     chip::Span<const EmberAfDeviceType> ret;
diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h
index 05be4e4884bce6..c977298fe4dcab 100644
--- a/src/app/util/attribute-storage.h
+++ b/src/app/util/attribute-storage.h
@@ -210,7 +210,7 @@ const EmberAfCluster * emberAfGetClusterByIndex(chip::EndpointId endpoint, uint8
 //
 // Retrieve the device type list associated with a specific endpoint.
 //
-const chip::Span<const EmberAfDeviceType> emberAfDeviceTypeListFromEndpoint(chip::EndpointId endpoint, CHIP_ERROR & err);
+chip::Span<const EmberAfDeviceType> emberAfDeviceTypeListFromEndpoint(chip::EndpointId endpoint, CHIP_ERROR & err);
 
 //
 // Over-ride the device type list current associated with an endpoint with a user-provided list. The buffers backing
diff --git a/src/lib/dnssd/IncrementalResolve.cpp b/src/lib/dnssd/IncrementalResolve.cpp
index bfea53353c3036..7131cbfaaf4d88 100644
--- a/src/lib/dnssd/IncrementalResolve.cpp
+++ b/src/lib/dnssd/IncrementalResolve.cpp
@@ -32,7 +32,7 @@ using namespace mdns::Minimal::Logging;
 
 namespace {
 
-const ByteSpan GetSpan(const mdns::Minimal::BytesRange & range)
+ByteSpan GetSpan(const mdns::Minimal::BytesRange & range)
 {
     return ByteSpan(range.Start(), range.Size());
 }
diff --git a/src/platform/DeviceSafeQueue.cpp b/src/platform/DeviceSafeQueue.cpp
index ea12becd026918..20e42ae3b8e5d9 100644
--- a/src/platform/DeviceSafeQueue.cpp
+++ b/src/platform/DeviceSafeQueue.cpp
@@ -40,7 +40,7 @@ bool DeviceSafeQueue::Empty()
     return mEventQueue.empty();
 }
 
-const ChipDeviceEvent DeviceSafeQueue::PopFront()
+ChipDeviceEvent DeviceSafeQueue::PopFront()
 {
     std::unique_lock<std::mutex> lock(mEventQueueLock);
 
diff --git a/src/platform/DeviceSafeQueue.h b/src/platform/DeviceSafeQueue.h
index 0e2b311eeae35d..6591a179409482 100644
--- a/src/platform/DeviceSafeQueue.h
+++ b/src/platform/DeviceSafeQueue.h
@@ -52,7 +52,7 @@ class DeviceSafeQueue
 
     void Push(const ChipDeviceEvent & event);
     bool Empty();
-    const ChipDeviceEvent PopFront();
+    ChipDeviceEvent PopFront();
 
 private:
     std::queue<ChipDeviceEvent> mEventQueue;