diff --git a/conf/distro/include/phosphor-defaults.inc b/conf/distro/include/phosphor-defaults.inc
index b36181c..0128fce 100644
--- a/conf/distro/include/phosphor-defaults.inc
+++ b/conf/distro/include/phosphor-defaults.inc
@@ -103,7 +103,6 @@
 VIRTUAL-RUNTIME_obmc-dump-monitor ?= "phosphor-debug-collector-monitor"
 
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
-PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent"
 
 # phosphor-hwmon-config
 #
diff --git a/recipes-core/systemd/obmc-targets.bb b/recipes-core/systemd/obmc-targets.bb
index f0051cf..1a13ea3 100644
--- a/recipes-core/systemd/obmc-targets.bb
+++ b/recipes-core/systemd/obmc-targets.bb
@@ -71,7 +71,6 @@
 
 SYSTEMD_SERVICE_${PN} += " \
         obmc-mapper.target \
-        obmc-webserver-pre.target \
         obmc-fans-ready.target \
         obmc-fan-control.target \
         obmc-fan-control-ready@.target \
diff --git a/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target b/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
deleted file mode 100644
index ea5200c..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-Description=Webserver (pre)
diff --git a/recipes-devtools/python/pamela_0.3.0.bb b/recipes-devtools/python/pamela_0.3.0.bb
deleted file mode 100644
index 8071fcb..0000000
--- a/recipes-devtools/python/pamela_0.3.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Pamela: yet another Python wrapper for PAM"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=bfb663f37eb99232bc8ccfa4ea8f1202"
-
-SRC_URI[md5sum] = "de6516118d51eb5fc97017f3b6d5c68b"
-SRC_URI[sha256sum] = "1e198446a6cdd87704aa0def7621d62e7c20b0e6068e2788b9a866a8355e5d6b"
-
-PYPI_PACKAGE = "pamela"
-
-inherit pypi setuptools
-
-RDEPENDS_${PN} = "libpam"
-
-inherit distro_features_check
-REQUIRED_DISTRO_FEATURES = "pam"
diff --git a/recipes-devtools/python/python-bottle.inc b/recipes-devtools/python/python-bottle.inc
deleted file mode 100644
index 159ded6..0000000
--- a/recipes-devtools/python/python-bottle.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Fast and simple WSGI-framework for small web-applications."
-DESCRIPTION = "Bottle is a fast and simple micro-framework for small web \
-applications. It offers request dispatching (Routes) with url parameter \
-support, templates, a built-in HTTP Server and adapters for many third \
-party WSGI/HTTP-server and template engines - all in a single file and \
-with no dependencies other than the Python Standard Library."
-HOMEPAGE = "http://bottlepy.org/"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=94b9b2cc7e46ccea87e00af8970826b5"
-
-inherit allarch
-inherit setuptools
-inherit pypi
-
-RDEPENDS_${PN} += " \
-        python-email \
-        python-json \
-        python-netserver \
-        "
-
-PROVIDES += "${PN}-app"
-PACKAGE_BEFORE_PN += "${PN}-app"
-
-SUMMARY_${PN}-app = "${SRCNAME} app"
-RDEPENDS_${PN}-app = "${PN}"
-FILES_${PN}-app = "${bindir}/bottle.py*"
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/recipes-devtools/python/python-bottle/LICENSE b/recipes-devtools/python/python-bottle/LICENSE
deleted file mode 100644
index 5f3e8de..0000000
--- a/recipes-devtools/python/python-bottle/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014, Marcel Hellkamp.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/recipes-devtools/python/python-bottle/json-format.patch b/recipes-devtools/python/python-bottle/json-format.patch
deleted file mode 100644
index 9e754a9..0000000
--- a/recipes-devtools/python/python-bottle/json-format.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: bottle-0.12.9/bottle.py
-===================================================================
---- bottle-0.12.9.orig/bottle.py
-+++ bottle-0.12.9/bottle.py
-@@ -1721,8 +1721,10 @@ class JSONPlugin(object):
-     name = 'json'
-     api  = 2
- 
--    def __init__(self, json_dumps=json_dumps):
-+    def __init__(self, json_dumps=json_dumps, **kw):
-         self.json_dumps = json_dumps
-+        self.json_kw = { x:y for x,y in kw.iteritems() \
-+                     if x in ['indent','sort_keys'] }
- 
-     def apply(self, callback, route):
-         dumps = self.json_dumps
-@@ -1735,12 +1737,12 @@ class JSONPlugin(object):
- 
-             if isinstance(rv, dict):
-                 #Attempt to serialize, raises exception on failure
--                json_response = dumps(rv)
-+                json_response = dumps(rv, **self.json_kw)
-                 #Set content type only if serialization succesful
-                 response.content_type = 'application/json'
-                 return json_response
-             elif isinstance(rv, HTTPResponse) and isinstance(rv.body, dict):
--                rv.body = dumps(rv.body)
-+                rv.body = dumps(rv.body, **self.json_kw)
-                 rv.content_type = 'application/json'
-             return rv
- 
diff --git a/recipes-devtools/python/python-bottle_0.12.13.bb b/recipes-devtools/python/python-bottle_0.12.13.bb
deleted file mode 100644
index 08d84ff..0000000
--- a/recipes-devtools/python/python-bottle_0.12.13.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SRC_URI[sha256sum] = "39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355"
-SRC_URI[md5sum] = "d2fe1b48c1d49217e78bf326b1cad437"
-
-# There is no license on pypi.  See:
-# https://github.com/bottlepy/bottle/commit/55a505b3a54bb7de23e9554cb8ce7f8e160c31a0
-SRC_URI += "file://LICENSE"
-
-SRC_URI += "file://json-format.patch"
-
-require python-bottle.inc
diff --git a/recipes-devtools/python/python-gevent-websocket_0.10.1.bb b/recipes-devtools/python/python-gevent-websocket_0.10.1.bb
deleted file mode 100644
index 8ac2a89..0000000
--- a/recipes-devtools/python/python-gevent-websocket_0.10.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-HOMEPAGE = "https://bitbucket.org/noppo/gevent-websocket"
-SUMMARY = "A websocket library for gevent Python networking library"
-DESCRIPTION = "\
-  WebSocket is a computer communications protocol, providing full-duplex \
-  communication channels over a single TCP connection. gevent-websocket \
-  library provides websocket support for gevent. \
-  "
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5aa2f1d4ea55d60497aa8c3debf29ab2"
-
-RDEPENDS_${PN} = "python-gevent"
-
-SRC_URI[md5sum] = "e095bf3358175489a956949c1b4de9ff"
-SRC_URI[sha256sum] = "7eaef32968290c9121f7c35b973e2cc302ffb076d018c9068d2f5ca8b2d85fb0"
-
-inherit setuptools pypi
diff --git a/recipes-devtools/python/python-gevent_1.2.2.bbappend b/recipes-devtools/python/python-gevent_1.2.2.bbappend
deleted file mode 100644
index 924d108..0000000
--- a/recipes-devtools/python/python-gevent_1.2.2.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Remove all python .py files from gevent recipe. Only the .pyc
-# files are required. Only do if openbmc-phosphor-tiny distro
-# feature is enabled.
-do_install_append_openbmc-phosphor-tiny() {
-    find ${D}/${PYTHON_SITEPACKAGES_DIR}/gevent/ -name \*.py -exec rm {} \;
-}
diff --git a/recipes-devtools/python/python_2.%.bbappend b/recipes-devtools/python/python_2.%.bbappend
index 5004973..ae0078b 100644
--- a/recipes-devtools/python/python_2.%.bbappend
+++ b/recipes-devtools/python/python_2.%.bbappend
@@ -1,17 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://0001-json-Use-int-long.__str__-to-convert-subclasses.patch"
 
-require wsgiref-${PYTHON_MAJMIN}-manifest.inc
-
-PROVIDES_prepend = "${PN}-spwd "
-PACKAGES_prepend = "${PN}-spwd "
-
-SUMMARY_${PN}-spwd = "Shadow database support"
-RDEPENDS_${PN}-spwd = "${PN}-core"
-FILES_${PN}-spwd= " \
-        ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/spwd.so \
-        ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/grp.so \
-        "
 # Remove all python .py files from python recipe. Only the .pyc
 # files are required. Only do this if the openbmc-phosphor-tiny
 # distro feature is enabled
diff --git a/recipes-devtools/python/wsgiref-2.7-manifest.inc b/recipes-devtools/python/wsgiref-2.7-manifest.inc
deleted file mode 100644
index a21d05e..0000000
--- a/recipes-devtools/python/wsgiref-2.7-manifest.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-NAME = "wsgiref"
-
-PROVIDES_prepend = "${PN}-${NAME} ${PN}-${NAME}-headers ${PN}-${NAME}-handlers ${PN}-${NAME}-validate ${PN}-${NAME}-simple_server ${PN}-${NAME}-util "
-PACKAGES_prepend = "${PN}-${NAME} ${PN}-${NAME}-headers ${PN}-${NAME}-handlers ${PN}-${NAME}-validate ${PN}-${NAME}-simple_server ${PN}-${NAME}-util "
-
-package_dir = "${libdir}/python${PYTHON_MAJMIN}/${NAME}"
-
-SUMMARY_${PN}-${NAME}-handlers = "${NAME} handlers"
-RDEPENDS_${PN}-${NAME}-handlers = "${PN}-${NAME}-util ${PN}-${NAME}-headers"
-FILES_${PN}-${NAME}-handlers = "${package_dir}/handlers.py*"
-
-SUMMARY_${PN}-${NAME}-headers = "${NAME} headers"
-RDEPENDS_${PN}-${NAME}-headers = "${PN}-${NAME}"
-FILES_${PN}-${NAME}-headers = "${package_dir}/headers.py*"
-
-SUMMARY_${PN}-${NAME}-simple_server = "${NAME} simple server"
-RDEPENDS_${PN}-${NAME}-simple_server = "${PN}-${NAME}-handlers"
-FILES_${PN}-${NAME}-simple_server = "${package_dir}/simple_server.py*"
-
-SUMMARY_${PN}-${NAME}-util = "${NAME} util"
-RDEPENDS_${PN}-${NAME}-util = "${PN}-${NAME}"
-FILES_${PN}-${NAME}-util = "${package_dir}/util.py*"
-
-SUMMARY_${PN}-${NAME}-validate = "${NAME} validate"
-RDEPENDS_${PN}-${NAME}-validate = "${PN}-${NAME}"
-FILES_${PN}-${NAME}-validate = "${package_dir}/validate.py*"
-
-SUMMARY_${PN}-${NAME} = "WSGI (PEP 333) Reference Library"
-RDEPENDS_${PN}-${NAME} = "${PN}-core"
-FILES_${PN}-${NAME} = " \
-        ${package_dir}/__init__.py* \
-        ${package_dir}.egg-info \
-        "
diff --git a/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service b/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
deleted file mode 100644
index 2dfc4cc..0000000
--- a/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Phosphor Webserver
-After=phosphor-gevent.socket
-After=obmc-webserver-pre.target
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env phosphor-gevent $APPLICATION
-SyslogIdentifier=phosphor-gevent
-Environment="PYTHONUNBUFFERED=1"
-EnvironmentFile={envfiledir}/obmc/wsgi_app
diff --git a/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket b/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket
deleted file mode 100644
index 1ee86da..0000000
--- a/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Phosphor Webserver socket
-
-[Socket]
-ListenStream=443
-
-[Install]
-WantedBy=sockets.target
diff --git a/recipes-phosphor/interfaces/phosphor-gevent_git.bb b/recipes-phosphor/interfaces/phosphor-gevent_git.bb
deleted file mode 100644
index a4ac9fc..0000000
--- a/recipes-phosphor/interfaces/phosphor-gevent_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "python-gevent startup script"
-DESCRIPTION = "python-gevent startup script."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
-
-inherit allarch
-inherit setuptools
-inherit obmc-phosphor-systemd
-
-require phosphor-rest.inc
-
-PROVIDES += "virtual/obmc-wsgihost"
-RPROVIDES_${PN} += "virtual-obmc-wsgihost"
-
-RDEPENDS_${PN} += " \
-        python-gevent \
-        "
-RRECOMMENDS_${PN} += "python-gevent-websocket"
-
-S = "${WORKDIR}/git/servers/gevent"
-
-SYSTEMD_SERVICE_${PN} += " ${PN}.service  ${PN}.socket"
diff --git a/recipes-phosphor/interfaces/phosphor-rest.inc b/recipes-phosphor/interfaces/phosphor-rest.inc
deleted file mode 100644
index 24bb688..0000000
--- a/recipes-phosphor/interfaces/phosphor-rest.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-HOMEPAGE = "http://github.com/openbmc/phosphor-rest-server"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-
-SRC_URI += "git://github.com/openbmc/phosphor-rest-server"
-SRCREV = "3c6d49a65b1928938b48866cb730d10577b496c4"
-
diff --git a/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app b/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app
deleted file mode 100644
index 7bbffe7..0000000
--- a/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app
+++ /dev/null
@@ -1 +0,0 @@
-APPLICATION=rest_dbus
diff --git a/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf b/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf
deleted file mode 100644
index a92f0f1..0000000
--- a/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Wants=obmc-webserver-pre.target
-Before=obmc-webserver-pre.target
diff --git a/recipes-phosphor/interfaces/phosphor-rest/url_config.json b/recipes-phosphor/interfaces/phosphor-rest/url_config.json
deleted file mode 100644
index d11b555..0000000
--- a/recipes-phosphor/interfaces/phosphor-rest/url_config.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "urls": [
- "/org/openbmc/*",
- "/xyz/openbmc_project/*",
- "/enumerate",
- "/list",
- "/login",
- "/logout",
- "/subscribe",
- "/upload/image",
- "/download/dump/*"
- ]
-}
diff --git a/recipes-phosphor/interfaces/phosphor-rest_git.bb b/recipes-phosphor/interfaces/phosphor-rest_git.bb
deleted file mode 100644
index 1331e4a..0000000
--- a/recipes-phosphor/interfaces/phosphor-rest_git.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "Phosphor DBUS to REST WSGI Application"
-DESCRIPTION = "Phosphor DBUS to REST WSGI Application."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
-
-inherit allarch
-inherit obmc-phosphor-systemd
-inherit setuptools
-inherit obmc-phosphor-discovery-service
-
-require phosphor-rest.inc
-
-RRECOMMENDS_${PN} += " \
-        virtual-obmc-wsgihost \
-        python-gevent-websocket \
-        "
-
-RDEPENDS_${PN} += " \
-        python-xml \
-        python-dbus \
-        phosphor-mapper \
-        python-bottle \
-        python-spwd \
-        pyphosphor-utils \
-        pyphosphor-dbus \
-        pyphosphor-wsgi-apps-ns \
-        pamela \
-        jsnbd \
-        "
-SRC_URI += "file://url_config.json \
-           "
-
-FILES_${PN}_append = " ${datadir}/rest-dbus/url_config.json"
-
-S = "${WORKDIR}/git/module"
-SYSTEMD_SERVICE_${PN} = ""
-SYSTEMD_OVERRIDE_${PN} += "rest-dbus.conf:obmc-mapper.target.d/rest-dbus.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/wsgi_app"
-REGISTERED_SERVICES_${PN} += "phosphor_rest:tcp:443"
-
-do_install_append(){
-    install -d ${D}${datadir}/rest-dbus
-    install -m 0644 -D ${WORKDIR}/url_config.json \
-        ${D}${datadir}/rest-dbus/url_config.json
-}