diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service
deleted file mode 100644
index ee5ec16..0000000
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Set the Asserted property of all the LED groups to %i
-Wants=xyz.openbmc_project.LED.GroupManager.service
-After=xyz.openbmc_project.LED.GroupManager.service
-After=phosphor-reset-chassis-running@0.service
-ConditionPathExists=!/run/openbmc/chassis@0-on
-
-[Service]
-Type=oneshot
-Restart=no
-EnvironmentFile={envfiledir}/obmc/led/set-all/groups/config
-ExecStart=/bin/bash -c "led-set-all-groups-asserted.sh %i ${{EXCLUDED_GROUPS}}"
-SyslogIdentifier=obmc-led-set-all-groups-asserted
diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index b36adca..d927f25 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_SERVICE:${PN}:append:p10bmc = " obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service"
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " obmc-led-create-virtual-leds@.service"
 
 # Copies config file having arguments for led-set-all-groups-asserted.sh
 SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc =" obmc/led/set-all/groups/config"
@@ -17,18 +17,6 @@
 
     # Needed this to run as part of BMC boot
     mkdir -p $D$systemd_system_unitdir/multi-user.target.wants
-    LINK="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-set-all-groups-asserted@false.service"
-    TARGET="../obmc-led-set-all-groups-asserted@.service"
-    ln -s $TARGET $LINK
-
-    # Needed this to run as part of Power On
-    mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants
-    LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/obmc-led-set-all-groups-asserted@false.service"
-    TARGET="../obmc-led-set-all-groups-asserted@.service"
-    ln -s $TARGET $LINK
-
-    # Needed this to run as part of BMC boot
-    mkdir -p $D$systemd_system_unitdir/multi-user.target.wants
     LINK_FAULT="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-create-virtual-leds@sys-class-leds-virtual-enc-fault.service"
     TARGET_FAULT="../obmc-led-create-virtual-leds@.service"
     ln -s $TARGET_FAULT $LINK_FAULT
@@ -42,12 +30,6 @@
 
 pkg_prerm:${PN}:p10bmc () {
 
-    LINK="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-set-all-groups-asserted@false.service"
-    rm $LINK
-
-    LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/obmc-led-set-all-groups-asserted@false.service"
-    rm $LINK
-
     LINK_FAULT="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-create-virtual-leds@sys-class-leds-virtual-enc-fault.service"
     rm $LINK_FAULT