diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
deleted file mode 100644
index fad4f13..0000000
--- a/meta-phosphor/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Phosphor Power Button%i
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env button_power.exe
-SyslogIdentifier=button_power.exe
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-button-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-button-power_git.bb
deleted file mode 100644
index f02803b..0000000
--- a/meta-phosphor/recipes-phosphor/chassis/obmc-button-power_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "OpenBMC org.openbmc.Button example implementation"
-DESCRIPTION = "A sample implementation for a button controlling a power domain."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
-
-inherit skeleton-gdbus
-inherit obmc-phosphor-dbus-service
-inherit pkgconfig
-
-SKELETON_DIR = "pwrbutton"
-
-FMT = "org.openbmc.buttons.Power@{0}.service"
-DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_BUTTON_INSTANCES')}"
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
deleted file mode 100644
index 395eeb9..0000000
--- a/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Phosphor Reset Button%i
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env button_reset.exe
-SyslogIdentifier=button_reset.exe
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset_git.bb
deleted file mode 100644
index 1a7836a..0000000
--- a/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "OpenBMC org.openbmc.Button example implementation"
-DESCRIPTION = "A sample implementation for a reset button."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
-
-inherit skeleton-gdbus
-inherit obmc-phosphor-dbus-service
-inherit pkgconfig
-
-SKELETON_DIR = "rstbutton"
-
-FMT = "org.openbmc.buttons.reset@{0}.service"
-DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_RESET_BUTTON_INSTANCES')}"