diff --git a/src/ExternalSensorMain.cpp b/src/ExternalSensorMain.cpp
index 647eb5a..1ced726 100644
--- a/src/ExternalSensorMain.cpp
+++ b/src/ExternalSensorMain.cpp
@@ -148,7 +148,7 @@
 }
 
 void createSensors(
-    boost::asio::io_service& io, sdbusplus::asio::object_server& objectServer,
+    sdbusplus::asio::object_server& objectServer,
     boost::container::flat_map<std::string, std::shared_ptr<ExternalSensor>>&
         sensors,
     std::shared_ptr<sdbusplus::asio::connection>& dbusConnection,
@@ -163,7 +163,7 @@
 
     auto getter = std::make_shared<GetSensorConfiguration>(
         dbusConnection,
-        [&io, &objectServer, &sensors, &dbusConnection, sensorsChanged,
+        [&objectServer, &sensors, &dbusConnection, sensorsChanged,
          &reaperTimer](const ManagedObjectType& sensorConfigurations) {
             bool firstScan = (sensorsChanged == nullptr);
 
@@ -362,15 +362,14 @@
         std::make_shared<boost::container::flat_set<std::string>>();
     boost::asio::steady_timer reaperTimer(io);
 
-    io.post([&io, &objectServer, &sensors, &systemBus, &reaperTimer]() {
-        createSensors(io, objectServer, sensors, systemBus, nullptr,
-                      reaperTimer);
+    io.post([&objectServer, &sensors, &systemBus, &reaperTimer]() {
+        createSensors(objectServer, sensors, systemBus, nullptr, reaperTimer);
     });
 
     boost::asio::deadline_timer filterTimer(io);
     std::function<void(sdbusplus::message::message&)> eventHandler =
-        [&io, &objectServer, &sensors, &systemBus, &sensorsChanged,
-         &filterTimer, &reaperTimer](sdbusplus::message::message& message) {
+        [&objectServer, &sensors, &systemBus, &sensorsChanged, &filterTimer,
+         &reaperTimer](sdbusplus::message::message& message) mutable {
             if (message.is_method_error())
             {
                 std::cerr << "callback method error\n";
@@ -388,21 +387,22 @@
             // this implicitly cancels the timer
             filterTimer.expires_from_now(boost::posix_time::seconds(1));
 
-            filterTimer.async_wait([&io, &objectServer, &sensors, &systemBus,
-                                    &sensorsChanged, &reaperTimer](
-                                       const boost::system::error_code& ec) {
-                if (ec != boost::system::errc::success)
-                {
-                    if (ec != boost::asio::error::operation_aborted)
+            filterTimer.async_wait(
+                [&objectServer, &sensors, &systemBus, &sensorsChanged,
+                 &reaperTimer](const boost::system::error_code& ec) mutable {
+                    if (ec != boost::system::errc::success)
                     {
-                        std::cerr << "callback error: " << ec.message() << "\n";
+                        if (ec != boost::asio::error::operation_aborted)
+                        {
+                            std::cerr << "callback error: " << ec.message()
+                                      << "\n";
+                        }
+                        return;
                     }
-                    return;
-                }
 
-                createSensors(io, objectServer, sensors, systemBus,
-                              sensorsChanged, reaperTimer);
-            });
+                    createSensors(objectServer, sensors, systemBus,
+                                  sensorsChanged, reaperTimer);
+                });
         };
 
     auto match = std::make_unique<sdbusplus::bus::match::match>(
