diff --git a/apphandler.cpp b/apphandler.cpp
index 65390c1..6d57345 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -5,7 +5,6 @@
 #include <limits.h>
 #include <linux/i2c-dev.h>
 #include <linux/i2c.h>
-#include <mapper.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/chassishandler.cpp b/chassishandler.cpp
index 553bbe0..414d6cb 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -5,7 +5,6 @@
 #include <arpa/inet.h>
 #include <endian.h>
 #include <limits.h>
-#include <mapper.h>
 #include <netinet/in.h>
 
 #include <ipmid/api.hpp>
diff --git a/dbus-sdr/meson.build b/dbus-sdr/meson.build
index 7cbd8cb..a0363ec 100644
--- a/dbus-sdr/meson.build
+++ b/dbus-sdr/meson.build
@@ -6,14 +6,9 @@
 
 sensorutils_dep = declare_dependency(link_with: sensorutils_lib)
 
-hybrid_dep = []
 hybrid_src = []
 
 if not get_option('hybrid-sensors').disabled()
-  hybrid_dep = [
-    mapper,
-  ]
-
   hybrid_src = [
     'sensorhandler.cpp',
     'sensordatahandler.cpp',
@@ -30,7 +25,6 @@
     phosphor_logging_dep,
     ipmid_dep,
     sensorutils_dep,
-    hybrid_dep,
   ])
 
 dbus_sdr_src = [
diff --git a/meson.build b/meson.build
index 7fca5e1..4d762d8 100644
--- a/meson.build
+++ b/meson.build
@@ -114,7 +114,6 @@
 systemd = dependency('systemd')
 crypto = dependency('libcrypto', version : '>=1.0.2g')
 pam = cpp.find_library('pam', required: true)
-mapper = dependency('libmapper')
 boost_coroutine = cpp.find_library('boost_coroutine', required: true)
 sdbusplus_dep = dependency('sdbusplus')
 stdplus_dep = dependency('stdplus')
@@ -173,7 +172,6 @@
   dependencies: [
     channellayer_dep,
     crypto,
-    mapper,
     nlohmann_json_dep,
     phosphor_dbus_interfaces_dep,
     phosphor_logging_dep,
@@ -202,7 +200,6 @@
   crypto,
   ipmid_dep,
   channellayer_dep,
-  mapper,
 ]
 
 transportoem_src = []
diff --git a/storageaddsel.cpp b/storageaddsel.cpp
index fc7e9c0..34e839e 100644
--- a/storageaddsel.cpp
+++ b/storageaddsel.cpp
@@ -2,7 +2,6 @@
 #include "sensorhandler.hpp"
 #include "storagehandler.hpp"
 
-#include <mapper.h>
 #include <systemd/sd-bus.h>
 
 #include <ipmid/api.hpp>
diff --git a/storagehandler.cpp b/storagehandler.cpp
index 4c02a50..d384693 100644
--- a/storagehandler.cpp
+++ b/storagehandler.cpp
@@ -9,7 +9,6 @@
 #include "storageaddsel.hpp"
 
 #include <arpa/inet.h>
-#include <mapper.h>
 #include <systemd/sd-bus.h>
 
 #include <ipmid/api.hpp>
diff --git a/subprojects/phosphor-objmgr.wrap b/subprojects/phosphor-objmgr.wrap
deleted file mode 100644
index 6e41898..0000000
--- a/subprojects/phosphor-objmgr.wrap
+++ /dev/null
@@ -1,6 +0,0 @@
-[wrap-git]
-url = https://github.com/openbmc/phosphor-objmgr
-revision = HEAD
-
-[provide]
-libmapper = mapper_dep
diff --git a/user_channel/meson.build b/user_channel/meson.build
index 1808b2b..d4f1126 100644
--- a/user_channel/meson.build
+++ b/user_channel/meson.build
@@ -74,7 +74,6 @@
   usercmds_pre = declare_dependency(
     include_directories: [root_inc, user_channel_inc],
     dependencies: [
-      mapper,
       phosphor_logging_dep,
       ipmid_dep,
       userlayer_dep,