diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
index aad2fa7..f81159c 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
@@ -196,137 +196,6 @@
           0xFF:
             type: int64_t
 
-0xe8:
-  entityID: 0x0A
-  entityInstance: 3
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/gpu0_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xe9:
-  entityID: 0x0A
-  entityInstance: 4
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/gpu1_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xea:
-  entityID: 0x0A
-  entityInstance: 5
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/gpu2_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-0xeb:
-  entityID: 0x0A
-  entityInstance: 6
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/gpu3_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xec:
-  entityID: 0x0A
-  entityInstance: 7
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/gpu4_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xed:
-  entityID: 0x0A
-  entityInstance: 8
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/gpu5_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
 0xee:
   entityID: 0x0A
   entityInstance: 9
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index 3d289b8..c7ea311 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
@@ -325,42 +325,6 @@
 CRITHI_power2 = "300000000"
 CRITLO_power2 = "0"
 
-LABEL_power24 = "gpu0_power"
-WARNHI_power24 = "330000000"
-WARNLO_power24 = "0"
-CRITHI_power24 = "350000000"
-CRITLO_power24 = "0"
-
-LABEL_power29 = "gpu1_power"
-WARNHI_power29 = "330000000"
-WARNLO_power29 = "0"
-CRITHI_power29 = "350000000"
-CRITLO_power29 = "0"
-
-LABEL_power30 = "gpu2_power"
-WARNHI_power30 = "330000000"
-WARNLO_power30 = "0"
-CRITHI_power30 = "350000000"
-CRITLO_power30 = "0"
-
-LABEL_power31 = "gpu3_power"
-WARNHI_power31 = "330000000"
-WARNLO_power31 = "0"
-CRITHI_power31 = "350000000"
-CRITLO_power31 = "0"
-
-LABEL_power32 = "gpu4_power"
-WARNHI_power32 = "330000000"
-WARNLO_power32 = "0"
-CRITHI_power32 = "350000000"
-CRITLO_power32 = "0"
-
-LABEL_power33 = "gpu5_power"
-WARNHI_power33 = "330000000"
-WARNLO_power33 = "0"
-CRITHI_power33 = "350000000"
-CRITLO_power33 = "0"
-
 LABEL_power18 = "fan_disk_power"
 WARNHI_power18 = "375000000"
 WARNLO_power18 = "0"