diff --git a/service_files/phosphor-bmc-security-check.service b/service_files/phosphor-bmc-security-check.service
index 060ff2a..9881b8f 100644
--- a/service_files/phosphor-bmc-security-check.service
+++ b/service_files/phosphor-bmc-security-check.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Phosphor BMC Security Check
-Wants=obmc-mapper.target
-After=obmc-mapper.target
 Wants=xyz.openbmc_project.Settings.service
 After=xyz.openbmc_project.Settings.service
 
diff --git a/service_files/xyz.openbmc_project.State.BMC.service b/service_files/xyz.openbmc_project.State.BMC.service
index c9520b1..2827603 100644
--- a/service_files/xyz.openbmc_project.State.BMC.service
+++ b/service_files/xyz.openbmc_project.State.BMC.service
@@ -2,8 +2,6 @@
 Description=Phosphor BMC State Manager
 Before=mapper-wait@-xyz-openbmc_project-state-bmc.service
 After=xyz.openbmc_project.State.Chassis@0.service
-Wants=obmc-mapper.target
-After=obmc-mapper.target
 
 
 [Service]
diff --git a/service_files/xyz.openbmc_project.State.Chassis@.service b/service_files/xyz.openbmc_project.State.Chassis@.service
index 4f9b98d..84bf4e7 100644
--- a/service_files/xyz.openbmc_project.State.Chassis@.service
+++ b/service_files/xyz.openbmc_project.State.Chassis@.service
@@ -1,8 +1,6 @@
 [Unit]
 Description=Phosphor Chassis%i State Manager
 Before=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Wants=obmc-mapper.target
-After=obmc-mapper.target
 After=org.openbmc.control.Power@%i.service
 
 [Service]
diff --git a/service_files/xyz.openbmc_project.State.Host@.service b/service_files/xyz.openbmc_project.State.Host@.service
index 3ec9a4f..21e8e39 100644
--- a/service_files/xyz.openbmc_project.State.Host@.service
+++ b/service_files/xyz.openbmc_project.State.Host@.service
@@ -4,8 +4,6 @@
 After=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot.service
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Wants=obmc-mapper.target
-After=obmc-mapper.target
 After=phosphor-ipmi-host.service
 After=pldmd.service
 Before=obmc-host-reset@%i.target
diff --git a/service_files/xyz.openbmc_project.State.Hypervisor.service b/service_files/xyz.openbmc_project.State.Hypervisor.service
index e0879bf..a6739f3 100644
--- a/service_files/xyz.openbmc_project.State.Hypervisor.service
+++ b/service_files/xyz.openbmc_project.State.Hypervisor.service
@@ -1,8 +1,6 @@
 [Unit]
 Description=Phosphor Hypervisor State Manager
 Before=mapper-wait@-xyz-openbmc_project-state-hypervisor.service
-Wants=obmc-mapper.target
-After=obmc-mapper.target
 
 [Service]
 ExecStart=/usr/bin/phosphor-hypervisor-state-manager
diff --git a/service_files/xyz.openbmc_project.State.ScheduledHostTransition@.service b/service_files/xyz.openbmc_project.State.ScheduledHostTransition@.service
index 13c617b..47e8679 100644
--- a/service_files/xyz.openbmc_project.State.ScheduledHostTransition@.service
+++ b/service_files/xyz.openbmc_project.State.ScheduledHostTransition@.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Phosphor Scheduled Host%i Transition Manager
-Wants=obmc-mapper.target
-After=obmc-mapper.target
 Wants=xyz.openbmc_project.State.Host%i.service
 After=xyz.openbmc_project.State.Host%i.service