diff --git a/group.cpp b/group.cpp
index fda5982..6c0f06a 100644
--- a/group.cpp
+++ b/group.cpp
@@ -11,17 +11,16 @@
     // Introducing these to enable gtest.
     Manager::group ledsAssert {};
     Manager::group ledsDeAssert {};
-    Manager::group ledsUpdate {};
 
     // Group management is handled by Manager. The populated leds* sets are not
     // really used by production code. They are there to enable gtest for
     // validation.
     auto result = manager.setGroupState(path, value, ledsAssert,
-                                        ledsDeAssert, ledsUpdate);
+                                        ledsDeAssert);
 
     // If something does not go right here, then there should be an sdbusplus
     // exception thrown.
-    manager.driveLEDs(ledsAssert, ledsDeAssert, ledsUpdate);
+    manager.driveLEDs(ledsAssert, ledsDeAssert);
 
     // Set the base class's asserted to 'true' since the getter
     // operation is handled there.
