diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
index 5671809..8dc7408 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
@@ -1082,28 +1082,6 @@
             "floor_offset_parameter": "altitude_offset",
             "floors": [
               {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 3700
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 3700
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 3700
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 3700
-                  }
-                ]
-              },
-              {
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 6000 },
@@ -1120,28 +1098,6 @@
             "floor_offset_parameter": "altitude_offset",
             "floors": [
               {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 5000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 5000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 5000
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 5000
-                  }
-                ]
-              },
-              {
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 7000 },
@@ -1158,28 +1114,6 @@
             "floor_offset_parameter": "altitude_offset",
             "floors": [
               {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 6000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 6000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 6000
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 6000
-                  }
-                ]
-              },
-              {
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 9000 },
@@ -1196,28 +1130,6 @@
             "floor_offset_parameter": "altitude_offset",
             "floors": [
               {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 8000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 8000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 8000
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 8000
-                  }
-                ]
-              },
-              {
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 9500 },
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/ibm,rainier-4u/events.json
index 2aac426..5968efb 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/events.json
@@ -1397,28 +1397,6 @@
             "floor_offset_parameter": "altitude_offset",
             "floors": [
               {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 5000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 5000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 5000
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 5000
-                  }
-                ]
-              },
-              {
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 7000 },
@@ -1435,28 +1413,6 @@
             "floor_offset_parameter": "altitude_offset",
             "floors": [
               {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 6000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 6000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 6000
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 6000
-                  }
-                ]
-              },
-              {
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 8000 },
@@ -1473,28 +1429,6 @@
             "floor_offset_parameter": "altitude_offset",
             "floors": [
               {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 7000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 7000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 7000
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 7000
-                  }
-                ]
-              },
-              {
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 9000 },
@@ -1511,28 +1445,6 @@
             "floor_offset_parameter": "altitude_offset",
             "floors": [
               {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 8000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 8000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 8000
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 8000
-                  }
-                ]
-              },
-              {
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 9500 },