diff --git a/meta-citadel-distro/conf/layer.conf b/meta-citadel-distro/conf/layer.conf
deleted file mode 100644
index 76bacaa..0000000
--- a/meta-citadel-distro/conf/layer.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH =. "${LAYERDIR}:"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "citadeldist"
-BBFILE_PATTERN_citadeldist = "^${LAYERDIR}/"
-BBFILE_PRIORITY_citadeldist = "5"
-
-LAYERSERIES_COMPAT_citadeldist = "rocko"
-
-# This should only be incremented on significant changes that will
-# cause compatibility issues with other layers
-LAYERVERSION_citadel = "1"
-
-REQUIRED_POKY_BBLAYERS_CONF_VERSION = "2"
diff --git a/meta-citadel-distro/recipes-misc/showvars/showvars.bb b/meta-citadel-distro/recipes-misc/showvars/showvars.bb
deleted file mode 100644
index 115e4fc..0000000
--- a/meta-citadel-distro/recipes-misc/showvars/showvars.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-
-SUMMARY = "Display variables"
-LICENSE = "MIT"
-
-
-INHIBIT_DEFAULT_DEPS = "1"
-PACKAGES = ""
-
-deltask do_fetch
-deltask do_unpack
-deltask do_patch
-deltask do_configure
-deltask do_compile
-deltask do_install
-deltask do_populate_sysroot
-
-inherit showvars nopackages
diff --git a/meta-citadel-distro/wic/citadel-image-minimal.wks b/meta-citadel-distro/wic/citadel-image-minimal.wks
deleted file mode 100644
index d8a88e9..0000000
--- a/meta-citadel-distro/wic/citadel-image-minimal.wks
+++ /dev/null
@@ -1,4 +0,0 @@
-part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --size=64 --fstype=vfat --label boot --active --align 1024 --use-uuid
-part / --source rootfs --fstype=ext4 --label rootfs --align 1024 --use-uuid 
-part /storage --fstype=ext4 --label storage --size=16 --use-uuid
-bootloader --ptable gpt --timeout=5 --append="add_efi_memmap intel_iommu=igfx_off cryptomgr.notests rcupdate.rcu_expedited=1 rcu_nocbs=0-64 tsc=reliable no_timer_check noreplace-smp i915.fastboot=1 quiet splash" 
diff --git a/meta-citadel-distro/classes/showvars.bbclass b/meta-citadel/classes/showvars.bbclass
similarity index 100%
rename from meta-citadel-distro/classes/showvars.bbclass
rename to meta-citadel/classes/showvars.bbclass
diff --git a/meta-foreign/README b/meta-foreign/README
deleted file mode 100644
index a2cfe1e..0000000
--- a/meta-foreign/README
+++ /dev/null
@@ -1,41 +0,0 @@
-This README file contains information on the contents of the meta-foreign layer.
-
-Please see the corresponding sections below for details.
-
-Dependencies
-============
-
-  URI: <first dependency>
-  branch: <branch name>
-
-  URI: <second dependency>
-  branch: <branch name>
-
-  .
-  .
-  .
-
-Patches
-=======
-
-Please submit any patches against the meta-foreign layer to the xxxx mailing list (xxxx@zzzz.org)
-and cc: the maintainer:
-
-Maintainer: XXX YYYYYY <xxx.yyyyyy@zzzzz.com>
-
-Table of Contents
-=================
-
-  I. Adding the meta-foreign layer to your build
- II. Misc
-
-
-I. Adding the meta-foreign layer to your build
-=================================================
-
-Run 'bitbake-layers add-layer meta-foreign'
-
-II. Misc
-========
-
---- replace with specific information about the meta-foreign layer ---
diff --git a/meta-foreign/SOURCES b/meta-foreign/SOURCES
deleted file mode 100644
index e55eaae..0000000
--- a/meta-foreign/SOURCES
+++ /dev/null
@@ -1,2 +0,0 @@
-https://github.com/openembedded/meta-openembedded/tree/master/meta-oe/recipes-extended/polkit
-
diff --git a/meta-foreign/recipes-example/example/example.bb b/meta-foreign/recipes-example/example/example.bb
deleted file mode 100644
index c4b873d..0000000
--- a/meta-foreign/recipes-example/example/example.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SUMMARY = "bitbake-layers recipe"
-DESCRIPTION = "Recipe created by bitbake-layers"
-LICENSE = "MIT"
-
-python do_build() {
-    bb.plain("***********************************************");
-    bb.plain("*                                             *");
-    bb.plain("*  Example recipe created by bitbake-layers   *");
-    bb.plain("*                                             *");
-    bb.plain("***********************************************");
-}