diff --git a/control/config_files/p10bmc/ibm,everest/groups.json b/control/config_files/p10bmc/ibm,everest/groups.json
index d6a0550..ab13488 100644
--- a/control/config_files/p10bmc/ibm,everest/groups.json
+++ b/control/config_files/p10bmc/ibm,everest/groups.json
@@ -890,16 +890,6 @@
    "name": "nvme temps",
    "service": "xyz.openbmc_project.NVMeSensor",
    "members": [
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_8_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_9_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_10_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
index 58e0169..d87e825 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
@@ -282,30 +282,6 @@
    "name": "nvme temps",
    "service": "xyz.openbmc_project.NVMeSensor",
    "members": [
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_8_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_9_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_10_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_11_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_12_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_13_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_14_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_15_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_16_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_17_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_18_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_19_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_20_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_21_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_22_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_23_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_24_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/groups.json b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
index 45fff8a..73d6d7a 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
@@ -502,14 +502,6 @@
    "name": "nvme temps",
    "service": "xyz.openbmc_project.NVMeSensor",
    "members": [
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_8_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/groups.json b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
index 6fd42a3..0644cf3 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
@@ -498,30 +498,6 @@
    "name": "nvme temps",
    "service": "xyz.openbmc_project.NVMeSensor",
    "members": [
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_8_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_9_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_10_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_11_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_12_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_13_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_14_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_15_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_16_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_17_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_18_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_19_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_20_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_21_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_22_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_23_Temp",
-     "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_24_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
      "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",