diff --git a/meta-fii/meta-mori/recipes-mori/mori-system/mori-entity-association-map.bb b/meta-fii/meta-mori/recipes-mori/mori-system/mori-entity-association-map.bb
deleted file mode 100644
index bfb21d3..0000000
--- a/meta-fii/meta-mori/recipes-mori/mori-system/mori-entity-association-map.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "Mori IPMI Entity association mapping."
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-SRC_URI += "file://mori_entity_association_map.json"
-
-FILES:${PN} = " \
-    ${datadir}/ipmi-entity-association/entity_association_map.json \
-    "
-
-do_install() {
-    install -d ${D}${datadir}/ipmi-entity-association
-    install -m 0644 -D ${WORKDIR}/mori_entity_association_map.json \
-        ${D}${datadir}/ipmi-entity-association/entity_association_map.json
-}
diff --git a/meta-fii/meta-mori/recipes-mori/mori-system/mori-entity-association-map/mori_entity_association_map.json b/meta-fii/meta-mori/recipes-mori/mori-system/mori-entity-association-map/mori_entity_association_map.json
deleted file mode 100644
index 15d6449..0000000
--- a/meta-fii/meta-mori/recipes-mori/mori-system/mori-entity-association-map/mori_entity_association_map.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "system_board": [
-        {"instance": 1, "name": "/"}
-    ],
-    "system_internal_expansion_board": [
-        {"instance": 1, "name": "/"}
-    ],
-    "power_system_board": [
-        {"instance": 1, "name": "/"}
-    ],
-    "add_in_card": [
-        {"instance": 3, "name": "/PE0"},
-        {"instance": 5, "name": "/PE1"},
-        {"instance": 6, "name": "/PE2"},
-        {"instance": 7, "name": "/PE3"}
-    ],
-    "fan": [
-        {"instance": 0, "name": "/fan0"},
-        {"instance": 1, "name": "/fan1"}
-    ],
-    "cooling_unit": [
-        {"instance": 0, "name": "/ZONE0"}
-    ]
-}
diff --git a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
index a759aaa..f57e152 100644
--- a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -7,7 +7,6 @@
 OBMC_IMAGE_EXTRA_INSTALL:append:mori = " google-ipmi-sys"
 OBMC_IMAGE_EXTRA_INSTALL:append:mori = " google-ipmi-i2c"
 OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-sel-logger"
-OBMC_IMAGE_EXTRA_INSTALL:append:mori = " mori-entity-association-map"
 
 # Required tools and utilities
 OBMC_IMAGE_EXTRA_INSTALL:append:mori = " hotswap-power-cycle"
diff --git a/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index a8e8443..cda2b04 100644
--- a/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1,6 +1 @@
 FILESEXTRAPATHS:prepend:mori := "${THISDIR}/${PN}:"
-
-# Remove unused entity-map JSON
-do_install:append:mori() {
-    rm ${D}${datadir}/ipmi-providers/entity-map.json
-}