diff --git a/conf/layer.conf b/conf/layer.conf
index 62685d4..74ac0c0 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILES += "${LAYERDIR}/yocto-shared/*.bbappend"
 BBFILES += "${BBFILES_SYSMOCOM_BSP}"
 
 # selects specific distro or master when DISTRO_VERSION contains snapshot
-BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5', 'dora'), ('1.1','edison'), ('1.7', 'dizzy')])[d.getVar('DISTRO_VERSION', True)[0:3]], 'master']['snapshot' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend"
+BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5', 'dora'), ('1.7', 'dizzy')])[d.getVar('DISTRO_VERSION', True)[0:3]], 'master']['snapshot' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend"
 
 BBFILE_COLLECTIONS += "sysmocom-bsp"
 BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/"
diff --git a/conf/machine/sysmobts-2050.conf b/conf/machine/sysmobts-2050.conf
deleted file mode 100644
index a58dcd0..0000000
--- a/conf/machine/sysmobts-2050.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: sysmoBTS 2050
-#@DESCRIPTION: sysmocom GmbH sysmoBTS 2050 family
-
-require sysmobts-v2.conf
-
-MACHINEOVERRIDES = "${MACHINE}:sysmobts-v2"
-
-# TODO: Remove this file once edison support is dropped from this layer
-
-# we are disabling the serial console for now, as it may interfere with
-# the MSP430 service processor communication until proper filtering/splitting
-# of the serial stream is implemented in the kernel
-SERIAL_CONSOLE = ""
-
-# we don't want a different UBIfs volume name, as this is compiled into u-boot,
-# and thus would require a different u-boot image in turn.
-UBI_VOLNAME="sysmobts-v2-rootfs"
diff --git a/recipes-bsp/netbase/init-ifupdown_sysmocom.inc b/recipes-bsp/netbase/init-ifupdown_sysmocom.inc
index 35ead56..9e1ff49 100644
--- a/recipes-bsp/netbase/init-ifupdown_sysmocom.inc
+++ b/recipes-bsp/netbase/init-ifupdown_sysmocom.inc
@@ -1,4 +1,3 @@
-# TODO: When dropping netbase for edison we can rename it
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/netbase-${PV}:${SYSMOCOM}/netbase:"
 PRINC = "4"
diff --git a/recipes-extra/wget/wget-1.13.4/fix_makefile.patch b/recipes-extra/wget/wget-1.13.4/fix_makefile.patch
deleted file mode 100644
index 3f34c76..0000000
--- a/recipes-extra/wget/wget-1.13.4/fix_makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: wget-1.12/po/Makefile.in.in
-===================================================================
---- wget-1.12.orig/po/Makefile.in.in	2009-09-04 09:31:54.000000000 -0700
-+++ wget-1.12/po/Makefile.in.in	2011-10-19 20:32:53.714812160 -0700
-@@ -8,8 +8,8 @@
- # Please note that the actual code of GNU gettext is covered by the GNU
- # General Public License and is *not* in the public domain.
- #
--# Origin: gettext-0.17
--GETTEXT_MACRO_VERSION = 0.17
-+# Origin: gettext-0.18
-+GETTEXT_MACRO_VERSION = 0.18
- 
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-Index: wget-1.12/configure.ac
-===================================================================
---- wget-1.12.orig/configure.ac	2009-09-22 09:39:49.000000000 -0700
-+++ wget-1.12/configure.ac	2011-10-19 20:32:53.714812160 -0700
-@@ -110,7 +110,7 @@
- dnl Gettext
- dnl
- AM_GNU_GETTEXT([external],[need-ngettext])
--AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.18])
- 
- AC_PROG_RANLIB
- 
-Index: wget-1.12/configure
-===================================================================
---- wget-1.12.orig/configure	2009-09-22 09:40:13.000000000 -0700
-+++ wget-1.12/configure	2011-10-19 20:33:46.578812174 -0700
-@@ -5297,7 +5297,7 @@
- 
- 
- 
--      GETTEXT_MACRO_VERSION=0.17
-+      GETTEXT_MACRO_VERSION=0.18
- 
- 
- 
-Index: wget-1.12/m4/po.m4
-===================================================================
---- wget-1.12.orig/m4/po.m4	2009-09-04 09:31:54.000000000 -0700
-+++ wget-1.12/m4/po.m4	2011-10-19 20:33:53.426812176 -0700
-@@ -30,7 +30,7 @@
- 
-   dnl Release version of the gettext macros. This is used to ensure that
-   dnl the gettext macros and po/Makefile.in.in are in sync.
--  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
- 
-   dnl Perform the following tests also if --disable-nls has been given,
-   dnl because they are needed for "make dist" to work.
diff --git a/recipes-extra/wget/wget.inc b/recipes-extra/wget/wget.inc
deleted file mode 100644
index 450d519..0000000
--- a/recipes-extra/wget/wget.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
-SECTION = "console/network"
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "openssl"
-
-INC_PR = "r13"
-
-inherit autotools gettext update-alternatives
-
-EXTRA_OECONF = "--with-libc --enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} --with-ssl=openssl"
-
-do_install_append () {
-	mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN}
-}
-
-ALTERNATIVE_NAME = "wget"
-ALTERNATIVE_LINK = "${bindir}/wget"
-ALTERNATIVE_PATH = "${bindir}/wget.${PN}"
-ALTERNATIVE_PRIORITY = "100"
diff --git a/recipes-extra/wget/wget_1.13.4.bb b/recipes-extra/wget/wget_1.13.4.bb
deleted file mode 100644
index b2da52f..0000000
--- a/recipes-extra/wget/wget_1.13.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-PR = "${INC_PR}.1"
-
-SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
-           file://fix_makefile.patch \
-          "
-SRC_URI[md5sum] = "1df489976a118b9cbe1b03502adbfc27"
-SRC_URI[sha256sum] = "24c7710bc9f220ce23d8a9e0f5673b0efc1cace62db6de0239b5863ecc934dcd"
-
-require wget.inc
diff --git a/yocto-edison/busybox_1.18.5.bbappend b/yocto-edison/busybox_1.18.5.bbappend
deleted file mode 100644
index 1d33444..0000000
--- a/yocto-edison/busybox_1.18.5.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# PN/PV are wrong inside the .inc file with 1.19.1
-SYSMOCOM_ORIG_PV := "${PV}"
-require recipes-core/busybox/${PN}_sysmocom.inc
diff --git a/yocto-edison/dropbear_0.52.bbappend b/yocto-edison/dropbear_0.52.bbappend
deleted file mode 100644
index a3a97a3..0000000
--- a/yocto-edison/dropbear_0.52.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-fixes/dropbear/${PN}_sysmocom.inc
diff --git a/yocto-edison/netbase_4.45.bbappend b/yocto-edison/netbase_4.45.bbappend
deleted file mode 100644
index 5e3605f..0000000
--- a/yocto-edison/netbase_4.45.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-bsp/netbase/${PN}_sysmocom.inc
diff --git a/yocto-edison/opkg_svn.bbappend b/yocto-edison/opkg_svn.bbappend
deleted file mode 100644
index 9e03591..0000000
--- a/yocto-edison/opkg_svn.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-edison/pkgconfig_0.25.bbappend b/yocto-edison/pkgconfig_0.25.bbappend
deleted file mode 100644
index 9e03591..0000000
--- a/yocto-edison/pkgconfig_0.25.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-edison/task-core-boot.bbappend b/yocto-edison/task-core-boot.bbappend
deleted file mode 100644
index 562a047..0000000
--- a/yocto-edison/task-core-boot.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-apps/tasks/${PN}_sysmocom.inc
diff --git a/yocto-edison/task-sdk-host-nativesdk.bbappend b/yocto-edison/task-sdk-host-nativesdk.bbappend
deleted file mode 100644
index 850e4b1..0000000
--- a/yocto-edison/task-sdk-host-nativesdk.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-# There is no point in packing qemu...
-PRINC = "1"
-
-# qemu removed
-RDEPENDS_${PN} = "\
-    pkgconfig-nativesdk \
-    pseudo-nativesdk \
-    unfs-server-nativesdk \
-    opkg-nativesdk \
-    libtool-nativesdk \
-    autoconf-nativesdk \
-    automake-nativesdk \
-    "
diff --git a/yocto-edison/u-boot_2011.03.bbappend b/yocto-edison/u-boot_2011.03.bbappend
deleted file mode 100644
index 34003ac..0000000
--- a/yocto-edison/u-boot_2011.03.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-sysmobts/uboot/${PN}_sysmocom.inc
diff --git a/yocto-edison/udev_164.bbappend b/yocto-edison/udev_164.bbappend
deleted file mode 100644
index 9e03591..0000000
--- a/yocto-edison/udev_164.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-edison/watchdog_5.9.bbappend b/yocto-edison/watchdog_5.9.bbappend
deleted file mode 100644
index 57590db..0000000
--- a/yocto-edison/watchdog_5.9.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-bsp/watchdog/${PN}_sysmocom.inc