diff --git a/configurations/yosemite4_floatingfalls.json b/configurations/yosemite4_floatingfalls.json
index c709e5b..e1f9a51 100644
--- a/configurations/yosemite4_floatingfalls.json
+++ b/configurations/yosemite4_floatingfalls.json
@@ -1,20 +1,5 @@
 {
-    "Exposes": [
-        {
-            "Address": "0x20",
-            "Bus": "$bus % 16",
-            "EndpointId": "$bus % 15 * 10 + 1",
-            "Name": "BIC",
-            "Type": "MCTPEndpoint"
-        },
-        {
-            "Address": "0x20",
-            "Bus": "$bus % 16",
-            "EndpointId": "$bus % 15 * 10 + 3",
-            "Name": "CXL",
-            "Type": "MCTPEndpoint"
-        }
-    ],
+    "Exposes": [],
     "Name": "Yosemite 4 Floating Falls Slot $bus % 15",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Floating Falls', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
     "Type": "Board",
diff --git a/configurations/yosemite4_sentineldome.json b/configurations/yosemite4_sentineldome.json
index 4d71cb9..5c298e5 100644
--- a/configurations/yosemite4_sentineldome.json
+++ b/configurations/yosemite4_sentineldome.json
@@ -1,13 +1,5 @@
 {
-    "Exposes": [
-        {
-            "Address": "0x20",
-            "Bus": "$bus % 16",
-            "EndpointId": "$bus % 15 * 10",
-            "Name": "BIC",
-            "Type": "MCTPEndpoint"
-        }
-    ],
+    "Exposes": [],
     "Name": "Yosemite 4 Sentinel Dome Slot $bus % 15",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Sentinel Dome', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
     "Type": "Board",
diff --git a/configurations/yosemite4_wailuafalls.json b/configurations/yosemite4_wailuafalls.json
index b897ff2..e8ca739 100644
--- a/configurations/yosemite4_wailuafalls.json
+++ b/configurations/yosemite4_wailuafalls.json
@@ -1,27 +1,5 @@
 {
-    "Exposes": [
-        {
-            "Address": "0x20",
-            "Bus": "$bus % 16",
-            "EndpointId": "$bus % 15 * 10 + 2",
-            "Name": "BIC",
-            "Type": "MCTPEndpoint"
-        },
-        {
-            "Address": "0x20",
-            "Bus": "$bus % 16",
-            "EndpointId": "$bus % 15 * 10 + 4",
-            "Name": "CXL1",
-            "Type": "MCTPEndpoint"
-        },
-        {
-            "Address": "0x20",
-            "Bus": "$bus % 16",
-            "EndpointId": "$bus % 15 * 10 + 5",
-            "Name": "CXL2",
-            "Type": "MCTPEndpoint"
-        }
-    ],
+    "Exposes": [],
     "Name": "Yosemite 4 Wailua Falls Slot $bus % 15",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Wailua Falls', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
     "Type": "Board",
diff --git a/schemas/legacy.json b/schemas/legacy.json
index 7330fa4..8f87057 100644
--- a/schemas/legacy.json
+++ b/schemas/legacy.json
@@ -65,9 +65,6 @@
                 "EntityInstance": {
                     "$ref": "#/definitions/Types/EntityInstance"
                 },
-                "EndpointId": {
-                    "$ref": "#/definitions/Types/EndpointId"
-                },
                 "FaultIndex": {
                     "$ref": "#/definitions/Types/FaultIndex"
                 },
@@ -736,9 +733,6 @@
             "EntityInstance": {
                 "type": "number"
             },
-            "EndpointId": {
-                "type": ["string", "number"]
-            },
             "FaultIndex": {
                 "type": "number"
             },