diff --git a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb
deleted file mode 100644
index 039c718..0000000
--- a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "Phosphor python library"
-DESCRIPTION = "Phosphor python library."
-HOMEPAGE = "http://github.com/openbmc/pyphosphor"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-SRCREV = "cb240aa1ed95799d2ea8bde951c6ed443839a7e0"
-PV = "1.0+git${SRCPV}"
-PR = "r1"
-
-SRC_URI += "git://github.com/openbmc/pyphosphor;branch=master;protocol=https"
-
-S = "${WORKDIR}/git"
-
-inherit allarch
-inherit setuptools3
-inherit python3-dir
-
-RDEPENDS:${PN}-utils-ns += "${PN}-ns"
-RDEPENDS:${PN}-dbus-ns += "${PN}-ns"
-RDEPENDS:${PN}-utils += "${PN}-utils-ns"
-RDEPENDS:${PN}-wsgi-apps-ns += "${PN}-wsgi-ns"
-RDEPENDS:${PN}-wsgi-ns += "${PN}-ns"
-RDEPENDS:${PN}-dbus += " \
-        ${PN}-dbus-ns \
-        python-dbus \
-        python-xml \
-        python-json \
-        python-pickle \
-        "
-RDEPENDS:${PN} += " \
-        ${PN}-ns \
-        ${PN}-dbus \
-        python-subprocess \
-        python-dbus \
-        "
-
-FILES:${PN}-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/__init__.py*"
-FILES:${PN}-utils-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/utils/__init__.py*"
-FILES:${PN}-dbus-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib/__init__.py*"
-FILES:${PN}-wsgi-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/wsgi/__init__.py*"
-FILES:${PN}-wsgi-apps-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/wsgi/apps/__init__.py*"
-FILES:${PN}-utils = "${PYTHON_SITEPACKAGES_DIR}/obmc/utils"
-FILES:${PN}-dbus = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib"
-
-PACKAGE_BEFORE_PN = " \
-        ${PN}-ns \
-        ${PN}-utils-ns \
-        ${PN}-dbus-ns \
-        ${PN}-wsgi-ns \
-        ${PN}-wsgi-apps-ns \
-        ${PN}-utils \
-        ${PN}-dbus \
-        "
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
deleted file mode 100644
index cfda54a..0000000
--- a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Phosphor Chassis%i Control
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env chassis_control.py
-SyslogIdentifier=chassis_control.py
-Type=dbus
-BusName={BUSNAME}
-Environment="PYTHONUNBUFFERED=1"
-TimeoutStartSec=180s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb
deleted file mode 100644
index 1f98bc0..0000000
--- a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "OpenBMC org.openbmc.control.Chassis example implementation"
-DESCRIPTION = "An example implementation of the org.openbmc.control.Chassis DBUS API."
-PV = "1.0+git${SRCPV}"
-PR = "r1"
-
-SKELETON_DIR = "pychassisctl"
-
-inherit skeleton-python
-inherit obmc-phosphor-dbus-service
-
-RDEPENDS:${PN} += "\
-        python-dbus \
-        python-pygobject \
-        python-netclient \
-        pyphosphor-dbus \
-        "
-
-FMT = "org.openbmc.control.Chassis@{0}.service"
-DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
deleted file mode 100644
index f062fc9..0000000
--- a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Set Fans to Maximum
-Wants=mapper-wait@-org-openbmc-control-fans.service
-After=mapper-wait@-org-openbmc-control-fans.service
-After=obmc-fan-control.target
-
-[Service]
-Type=oneshot
-Restart=no
-ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/fans` /org/openbmc/control/fans org.openbmc.control.Fans setMax"
-SyslogIdentifier=obmc-max-fans
diff --git a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
deleted file mode 100644
index adcee26..0000000
--- a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Phosphor Fan Control
-Wants=obmc-fans-ready.target
-After=obmc-fans-ready.target
-Wants=obmc-fan-control.target
-Before=obmc-fan-control.target
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env fan_control.exe -f 6
-SyslogIdentifier=fan_control.exe
-Type=dbus
-BusName={BUSNAME}
-Environment="PYTHONUNBUFFERED=1"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb
deleted file mode 100644
index 7689fa6..0000000
--- a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "OpenBMC fan control"
-DESCRIPTION = "OpenBMC fan control."
-DEPENDS = "systemd"
-PV = "1.0+git${SRCPV}"
-PR = "r1"
-
-SKELETON_DIR = "fanctl"
-SYSTEMD_SERVICE:${PN} += "obmc-max-fans.service"
-
-inherit skeleton-sdbus
-inherit obmc-phosphor-dbus-service
-inherit pkgconfig
-
-DBUS_SERVICE:${PN} += "org.openbmc.control.Fans.service"
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
deleted file mode 100644
index dcb561e..0000000
--- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Initialize BIOS Flash
-Wants=mapper-wait@-org-openbmc-control-flash-bios.service
-After=mapper-wait@-org-openbmc-control-flash-bios.service
-
-[Service]
-Restart=no
-ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/flash/bios` /org/openbmc/control/flash/bios org.openbmc.Flash init"
-SyslogIdentifier=obmc-flash-init
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
deleted file mode 100644
index 53502fc..0000000
--- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Phosphor BIOS Code Update
-Wants=mapper-wait@-org-openbmc-managers-Download.service
-After=mapper-wait@-org-openbmc-managers-Download.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env flash_bios.exe
-SyslogIdentifier=flash_bios.exe
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb
deleted file mode 100644
index 9dd30e3..0000000
--- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "OpenBMC org.openbmc.Flash example implementation"
-DESCRIPTION = "A sample implementation for the org.openbmc.Flash DBUS API. \
-org.openbmc.Flash provides APIs for functions like BIOS flash access control \
-and updating."
-PV = "1.0+git${SRCPV}"
-PR = "r1"
-
-SKELETON_DIR = "flashbios"
-SYSTEMD_SERVICE:${PN} += "obmc-flash-init.service"
-
-inherit skeleton-gdbus
-inherit obmc-phosphor-dbus-service
-inherit pkgconfig
-
-DBUS_SERVICE:${PN} += "org.openbmc.control.Flash.service"
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
deleted file mode 100644
index 95396e3..0000000
--- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Phosphor BMC Code Update
-Wants=mapper-wait@-org-openbmc-managers-Download.service
-After=mapper-wait@-org-openbmc-managers-Download.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env bmc_update.py
-SyslogIdentifier=bmc_update.py
-Environment="PYTHONUNBUFFERED=1"
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb
deleted file mode 100644
index 0c4053c..0000000
--- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "OpenBMC BMC update utility"
-DESCRIPTION = "OpenBMC BMC update utility."
-PV = "1.0+git${SRCPV}"
-PR = "r1"
-
-SKELETON_DIR = "pyflashbmc"
-
-inherit skeleton-python
-inherit obmc-phosphor-dbus-service
-
-RDEPENDS:${PN} += "\
-        python-dbus \
-        python-compression \
-        python-shell \
-        python-pygobject \
-        python-subprocess \
-        python-io \
-        pyphosphor-dbus \
-        "
-
-DBUS_SERVICE:${PN} += "org.openbmc.control.BmcFlash.service"
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
deleted file mode 100644
index 55ee6d4..0000000
--- a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Phosphor Download Manager
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env download_manager.py
-SyslogIdentifier=download_manager.py
-Environment="PYTHONUNBUFFERED=1"
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb
deleted file mode 100644
index 7ba18e4..0000000
--- a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "OpenBMC org.openbmc.managers.Download example implementation"
-DESCRIPTION = "An example implementation for the org.openbmc.managers.Download DBUS API."
-PV = "1.0+git${SRCPV}"
-PR = "r1"
-
-SKELETON_DIR = "pydownloadmgr"
-
-inherit skeleton-python
-inherit obmc-phosphor-dbus-service
-
-RDEPENDS:${PN} += "\
-        python-dbus \
-        python-pygobject \
-        python-subprocess \
-        pyphosphor-dbus \
-        "
-
-DBUS_SERVICE:${PN} += "org.openbmc.managers.Download.service"
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb
deleted file mode 100644
index 4818c20..0000000
--- a/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SUMMARY = "OpenPOWER flashing utility."
-DESCRIPTION = "A BMC/BIOS flashing utility for use on OpenPOWER system."
-DEPENDS += "pflash"
-PV = "1.0+git${SRCPV}"
-PR = "r1"
-
-SKELETON_DIR = "op-flasher"
-
-inherit skeleton-gdbus
-inherit pkgconfig
-
-RDEPENDS:${PN} += "pflash"