diff --git a/host-bmc/host_pdr_handler.cpp b/host-bmc/host_pdr_handler.cpp
index 63512a3..f23407b 100644
--- a/host-bmc/host_pdr_handler.cpp
+++ b/host-bmc/host_pdr_handler.cpp
@@ -88,14 +88,10 @@
                 if (propVal == "xyz.openbmc_project.State.Host.HostState.Off")
                 {
                     // Delete all the remote terminus information
-                    for (const auto& terminusInfo : this->tlPDRInfo)
-                    {
-                        if (terminusInfo.first != TERMINUS_HANDLE)
-                        {
-                            this->tlPDRInfo.erase(terminusInfo.first);
-                        }
-                    }
-
+                    std::erase_if(tlPDRInfo, [](const auto& item) {
+                        auto const& [key, value] = item;
+                        return key != TERMINUS_HANDLE;
+                    });
                     pldm_pdr_remove_remote_pdrs(repo);
                     pldm_entity_association_tree_destroy_root(entityTree);
                     pldm_entity_association_tree_copy_root(bmcEntityTree,
diff --git a/oem/ibm/libpldmresponder/file_io.hpp b/oem/ibm/libpldmresponder/file_io.hpp
index 10c6d47..ee8074d 100644
--- a/oem/ibm/libpldmresponder/file_io.hpp
+++ b/oem/ibm/libpldmresponder/file_io.hpp
@@ -234,7 +234,7 @@
             sdbusplus::bus::match::rules::interfacesAdded() +
                 sdbusplus::bus::match::rules::argNpath(0, dumpObjPath),
             [this, hostSockFd, hostEid, dbusImplReqester,
-             &handler](sdbusplus::message::message& msg) {
+             handler](sdbusplus::message::message& msg) {
                 std::map<
                     std::string,
                     std::map<std::string, std::variant<std::string, uint32_t>>>
@@ -277,7 +277,7 @@
             sdbusplus::bus::match::rules::interfacesAdded() +
                 sdbusplus::bus::match::rules::argNpath(0, certObjPath),
             [this, hostSockFd, hostEid, dbusImplReqester,
-             &handler](sdbusplus::message::message& msg) {
+             handler](sdbusplus::message::message& msg) {
                 std::map<
                     std::string,
                     std::map<std::string, std::variant<std::string, uint32_t>>>