diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index 7a74a70..d0bd3b9 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -513,19 +513,12 @@
             "Type": "ADC"
         },
         {
-            "BindGpioIntrusion": "Chassis Intrusion GPIO",
             "Class": "Gpio",
+            "GpioPolarity": "Low",
             "Name": "Chassis Intrusion Sensor",
             "Type": "ChassisIntrusionSensor"
         },
         {
-            "Direction": "Input",
-            "Index": 143,
-            "Name": "Chassis Intrusion GPIO",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
             "Name": "4U System Fan connector 1",
             "Pwm": 1,
             "Status": "disabled",
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index 24822f8..e1cc34d 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -528,41 +528,6 @@
             "Type": "ADC"
         },
         {
-            "Direction": "Input",
-            "Index": 40,
-            "Name": "NMI Input",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 51,
-            "Name": "Lcp Enter Button",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 52,
-            "Name": "Lcp Left Button",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 53,
-            "Name": "Lcp Right Button",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 218,
-            "Name": "ID Button",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
             "Name": "1U System Fan connector 1",
             "Pwm": 0,
             "Status": "disabled",