diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index 69884ab..858313d 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -29,7 +29,6 @@
         obmc-control-chassis \
         obmc-op-control-power \
         obmc-pcie-detect \
-        obmc-watchdog \
         obmc-host-failure-reboots \
         "
 #Pull in obmc-fsi on all P9 OpenPOWER systems
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb
deleted file mode 100644
index 72aa076..0000000
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "OpenBMC org.openbmc.Watchdog example implementation"
-DESCRIPTION = "A sample implementation for the org.openbmc.Watchdog DBUS API."
-PR = "r1"
-
-inherit skeleton-gdbus
-inherit obmc-phosphor-dbus-service
-
-SKELETON_DIR = "hostwatchdog"
-
-FMT = "org.openbmc.watchdog.Host@{0}.service"
-DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_WATCHDOG_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "obmc-start-watchdog@.service obmc-stop-watchdog@.service"
-
-START_TMPL = "obmc-start-watchdog@.service"
-START_TGTFMT = "obmc-host-start@{1}.target"
-START_INSTFMT = "obmc-start-watchdog@{0}.service"
-START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}"
-
-STOP_TMPL = "obmc-stop-watchdog@.service"
-STOP_TGTFMT = "obmc-host-stop@{1}.target"
-STOP_INSTFMT = "obmc-stop-watchdog@{0}.service"
-STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}"
-
-# Ensure we also call the stop watchdog if the user
-# just directly cuts chassis power
-CHASSIS_TGTFMT= "obmc-chassis-poweroff@{1}.target"
-CHASSIS_FMT = "../${STOP_TMPL}:${CHASSIS_TGTFMT}.requires/${STOP_INSTFMT}"
-
-
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_WATCHDOG_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_WATCHDOG_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_FMT', 'OBMC_WATCHDOG_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
deleted file mode 100644
index 77ed037..0000000
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Start Watchdog%i
-Wants=obmc-host-started@%i.target
-After=obmc-host-started@%i.target
-Wants=mapper-wait@-org-openbmc-watchdog-host%i.service
-After=mapper-wait@-org-openbmc-watchdog-host%i.service
-Conflicts=obmc-host-stop@%i.target
-ConditionPathExists=!/run/openbmc/host@%i-on
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog set i 30000
-ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog start
-
-[Install]
-WantedBy=obmc-host-start@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
deleted file mode 100644
index 63f340b..0000000
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Stop Watchdog%i
-Wants=mapper-wait@-org-openbmc-watchdog-host%i.service
-After=mapper-wait@-org-openbmc-watchdog-host%i.service
-Wants=obmc-host-stop-pre@%i.target
-Before=obmc-host-stop-pre@%i.target
-Conflicts=obmc-host-start@%i.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog stop
-
-[Install]
-WantedBy=obmc-host-stop@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service
deleted file mode 100644
index 2429c64..0000000
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Phosphor Watchdog%i
-
-[Service]
-Restart=always
-ExecStart={sbindir}/host_watchdog.exe
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}