diff --git a/blobs/t420/extract.sh b/blobs/t420/extract.sh
deleted file mode 100755
index 812d51664..000000000
--- a/blobs/t420/extract.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-function printusage {
-  echo "Usage: $0 -f <romdump> -m <me_cleaner>(optional) -i <ifdtool>(optional)"
-  exit 0
-}
-
-BLOBDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-if [ "$#" -eq 0 ]; then printusage; fi
-
-while getopts ":f:m:i:" opt; do
-  case $opt in
-    f)
-      FILE="$OPTARG"
-      ;;
-    m)
-      if [ -x "$OPTARG" ]; then
-        MECLEAN="$OPTARG"
-      fi
-      ;;
-    i)
-      if [ -x "$OPTARG" ]; then
-        IFDTOOL="$OPTARG"
-      fi
-      ;;
-  esac
-done
-
-if [ -z "$MECLEAN" ]; then
-  MECLEAN=`command -v $BLOBDIR/../../build/coreboot-*/util/me_cleaner/me_cleaner.py 2>&1|head -n1`
-  if [ -z "$MECLEAN" ]; then
-    echo "me_cleaner.py required but not found or specified with -m. Aborting."
-    exit 1;
-  fi
-fi
-
-if [ -z "$IFDTOOL" ]; then
-  IFDTOOL=`command -v $BLOBDIR/../../build/coreboot-*/util/ifdtool/ifdtool 2>&1|head -n1`
-  if [ -z "$IFDTOOL" ]; then
-    echo "ifdtool required but not found or specified with -m. Aborting."
-    exit 1;
-  fi
-fi
-
-echo "FILE: $FILE"
-echo "ME: $MECLEAN"
-echo "IFD: $IFDTOOL"
-
-bioscopy=$(mktemp)
-extractdir=$(mktemp -d)
-
-cp "$FILE" $bioscopy
-
-cd "$extractdir"
-$IFDTOOL -x $bioscopy
-cp "$extractdir/flashregion_3_gbe.bin" "$BLOBDIR/gbe.bin"
-$MECLEAN -r -t -d -O /tmp/unneeded.bin -D "$BLOBDIR/ifd.bin" -M "$BLOBDIR/me.bin" "$extractdir/flashregion_2_intel_me.bin"
-$IFDTOOL -n "$BLOBDIR/layout.txt" $bioscopy
-$IFDTOOL -x $bioscopy.new
-
-rm "$bioscopy"
-rm "$bioscopy.new"
-rm -r "$extractdir"
diff --git a/blobs/t420/layout.txt b/blobs/t420/layout.txt
deleted file mode 100644
index bbd90962c..000000000
--- a/blobs/t420/layout.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-00000000:00000fff fd
-00018000:007fffff bios
-00003000:00017fff me
-00001000:00002fff gbe
diff --git a/blobs/t420/readme.md b/blobs/t420/readme.md
deleted file mode 100644
index 4a40a0528..000000000
--- a/blobs/t420/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-To build for T420, we need to have the following files in this folder:
-* `me.bin` - ME binary that has been stripped and truncated with me_cleaner
-* `gbe.bin` - Network card blob from the original firmware
-* `ifd.bin` - Flash layout file has been provided as text
-
-To get the binaries, start with a copy of the original Lenovo firmware image.
-If you do not have one already, you can read one out from the laptops SPI flash with flashrom
-
-```
-flashrom -p <programmer> -r original.bin
-```
-
-Set `<programmer>` to the flashrom programmer type that you will use (for example, `linux_spi:dev=/dev/spidev0.0` on a Raspberry Pi).
-
-Once you have the image, the provided extraction script will extract the files needed.
-
-```
-./extract.sh -f <romdump>
-```
-
-Use the options '-m' and '-i' to provide me_cleaner and ifdtool if they can not be located automatically.
-
-The flash layout will be automatically adjusted and the ME image cleaned and truncated.
-
-You can now compile the image with:
-
-```
-make BOARD=t420
-```
diff --git a/blobs/x220/.gitignore b/blobs/x220/.gitignore
deleted file mode 100644
index 62887eff3..000000000
--- a/blobs/x220/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-gbe.bin
-me.bin
-ifd.bin
diff --git a/blobs/x220/extract.sh b/blobs/x220/extract.sh
deleted file mode 100755
index 812d51664..000000000
--- a/blobs/x220/extract.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-function printusage {
-  echo "Usage: $0 -f <romdump> -m <me_cleaner>(optional) -i <ifdtool>(optional)"
-  exit 0
-}
-
-BLOBDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-if [ "$#" -eq 0 ]; then printusage; fi
-
-while getopts ":f:m:i:" opt; do
-  case $opt in
-    f)
-      FILE="$OPTARG"
-      ;;
-    m)
-      if [ -x "$OPTARG" ]; then
-        MECLEAN="$OPTARG"
-      fi
-      ;;
-    i)
-      if [ -x "$OPTARG" ]; then
-        IFDTOOL="$OPTARG"
-      fi
-      ;;
-  esac
-done
-
-if [ -z "$MECLEAN" ]; then
-  MECLEAN=`command -v $BLOBDIR/../../build/coreboot-*/util/me_cleaner/me_cleaner.py 2>&1|head -n1`
-  if [ -z "$MECLEAN" ]; then
-    echo "me_cleaner.py required but not found or specified with -m. Aborting."
-    exit 1;
-  fi
-fi
-
-if [ -z "$IFDTOOL" ]; then
-  IFDTOOL=`command -v $BLOBDIR/../../build/coreboot-*/util/ifdtool/ifdtool 2>&1|head -n1`
-  if [ -z "$IFDTOOL" ]; then
-    echo "ifdtool required but not found or specified with -m. Aborting."
-    exit 1;
-  fi
-fi
-
-echo "FILE: $FILE"
-echo "ME: $MECLEAN"
-echo "IFD: $IFDTOOL"
-
-bioscopy=$(mktemp)
-extractdir=$(mktemp -d)
-
-cp "$FILE" $bioscopy
-
-cd "$extractdir"
-$IFDTOOL -x $bioscopy
-cp "$extractdir/flashregion_3_gbe.bin" "$BLOBDIR/gbe.bin"
-$MECLEAN -r -t -d -O /tmp/unneeded.bin -D "$BLOBDIR/ifd.bin" -M "$BLOBDIR/me.bin" "$extractdir/flashregion_2_intel_me.bin"
-$IFDTOOL -n "$BLOBDIR/layout.txt" $bioscopy
-$IFDTOOL -x $bioscopy.new
-
-rm "$bioscopy"
-rm "$bioscopy.new"
-rm -r "$extractdir"
diff --git a/blobs/x220/layout.txt b/blobs/x220/layout.txt
deleted file mode 100644
index bbd90962c..000000000
--- a/blobs/x220/layout.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-00000000:00000fff fd
-00018000:007fffff bios
-00003000:00017fff me
-00001000:00002fff gbe
diff --git a/blobs/x220/readme.md b/blobs/x220/readme.md
deleted file mode 100644
index 2d2ce210e..000000000
--- a/blobs/x220/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-To build for X220 we need to have the following files in this folder:
-* `me.bin` - ME binary that has been stripped and truncated with me_cleaner
-* `gbe.bin` - Network card blob from the original firmware
-* `ifd.bin` - Flash layout file has been provided as text
-
-To get the binaries, start with a copy of the original Lenovo firmware image.
-If you do not have one already, you can read one out from the laptops SPI flash.
-
-```
-flashrom --programmer internal -r original.bin
-```
-
-Once you have the image, the provided extraction script will extract the files needed.
-
-```
-./extract.sh -f <romdump>
-```
-
-Use the options '-m' and '-i' to provide me_cleaner and ifdtool if they can not be located
-automatically.
-
-The flash layout will be automatically adjusted and the ME image cleaned and truncated.
-
-You can now compile the image with:
-
-make BOARD=x220
diff --git a/boards/t420/t420.config b/boards/t420/t420.config
deleted file mode 100644
index e70cc64ff..000000000
--- a/boards/t420/t420.config
+++ /dev/null
@@ -1,37 +0,0 @@
-# Configuration for a T420 running Qubes and other OS, T420 is identical to X230 on the Linux Side of things.
-export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.8.1
-export CONFIG_LINUX_VERSION=4.14.62
-
-CONFIG_COREBOOT_CONFIG=config/coreboot-t420-deprecated.config
-CONFIG_LINUX_CONFIG=config/linux-x230.config
-
-CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
-CONFIG_FLASHTOOLS=y
-CONFIG_GPG2=y
-CONFIG_KEXEC=y
-CONFIG_UTIL_LINUX=y
-CONFIG_LVM2=y
-CONFIG_MBEDTLS=y
-CONFIG_PCIUTILS=y
-CONFIG_POPT=y
-CONFIG_QRENCODE=y
-CONFIG_TPMTOTP=y
-CONFIG_DROPBEAR=y
-
-CONFIG_CAIRO=y
-CONFIG_FBWHIPTAIL=y
-
-CONFIG_LINUX_USB=y
-CONFIG_LINUX_E1000E=y
-
-export CONFIG_TPM=y
-export CONFIG_BOOTSCRIPT=/bin/gui-init
-export CONFIG_BOOT_REQ_HASH=n
-export CONFIG_BOOT_REQ_ROLLBACK=n
-export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off"
-export CONFIG_BOOT_KERNEL_REMOVE="quiet"
-export CONFIG_BOOT_DEV="/dev/sda1"
-export CONFIG_BOARD_NAME="ThinkPad T420"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq --ifd --image bios"
diff --git a/boards/x220/x220.config b/boards/x220/x220.config
deleted file mode 100644
index d0b1af495..000000000
--- a/boards/x220/x220.config
+++ /dev/null
@@ -1,37 +0,0 @@
-# Configuration for a x220 running Qubes and other OS, X220 is identical to X230 on the Linux Side of things.
-export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.8.1
-export CONFIG_LINUX_VERSION=4.14.62
-
-CONFIG_COREBOOT_CONFIG=config/coreboot-x220-deprecated.config
-CONFIG_LINUX_CONFIG=config/linux-x230.config
-
-CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
-CONFIG_FLASHTOOLS=y
-CONFIG_GPG2=y
-CONFIG_KEXEC=y
-CONFIG_UTIL_LINUX=y
-CONFIG_LVM2=y
-CONFIG_MBEDTLS=y
-CONFIG_PCIUTILS=y
-CONFIG_POPT=y
-CONFIG_QRENCODE=y
-CONFIG_TPMTOTP=y
-CONFIG_DROPBEAR=y
-
-CONFIG_CAIRO=y
-CONFIG_FBWHIPTAIL=y
-
-CONFIG_LINUX_USB=y
-CONFIG_LINUX_E1000E=y
-
-export CONFIG_TPM=y
-export CONFIG_BOOTSCRIPT=/bin/gui-init
-export CONFIG_BOOT_REQ_HASH=n
-export CONFIG_BOOT_REQ_ROLLBACK=n
-export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off"
-export CONFIG_BOOT_KERNEL_REMOVE="quiet"
-export CONFIG_BOOT_DEV="/dev/sda1"
-export CONFIG_BOARD_NAME="ThinkPad X220"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq --ifd --image bios"
diff --git a/config/coreboot-t420-deprecated.config b/config/coreboot-t420-deprecated.config
deleted file mode 100644
index 59a91b8b0..000000000
--- a/config/coreboot-t420-deprecated.config
+++ /dev/null
@@ -1,24 +0,0 @@
-CONFIG_ANY_TOOLCHAIN=y
-# CONFIG_INCLUDE_CONFIG_FILE is not set
-# CONFIG_COLLECT_TIMESTAMPS is not set
-CONFIG_USE_BLOBS=y
-CONFIG_MEASURED_BOOT=y
-CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0x750000
-CONFIG_ONBOARD_VGA_IS_PRIMARY=y
-CONFIG_HAVE_IFD_BIN=y
-CONFIG_HAVE_ME_BIN=y
-CONFIG_HAVE_GBE_BIN=y
-CONFIG_IFD_BIN_PATH="../../blobs/t420/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/t420/me.bin"
-CONFIG_BOARD_LENOVO_T420=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
-CONFIG_NO_POST=y
-CONFIG_GBE_BIN_PATH="../../blobs/t420/gbe.bin"
-CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
-CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t420/bzImage"
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/t420/initrd.cpio.xz"
-CONFIG_DEBUG_SMM_RELOCATION=y
diff --git a/config/coreboot-x220-deprecated.config b/config/coreboot-x220-deprecated.config
deleted file mode 100644
index 88167453a..000000000
--- a/config/coreboot-x220-deprecated.config
+++ /dev/null
@@ -1,24 +0,0 @@
-CONFIG_ANY_TOOLCHAIN=y
-# CONFIG_INCLUDE_CONFIG_FILE is not set
-# CONFIG_COLLECT_TIMESTAMPS is not set
-CONFIG_USE_BLOBS=y
-CONFIG_MEASURED_BOOT=y
-CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0x750000
-CONFIG_ONBOARD_VGA_IS_PRIMARY=y
-CONFIG_HAVE_IFD_BIN=y
-CONFIG_HAVE_ME_BIN=y
-CONFIG_HAVE_GBE_BIN=y
-CONFIG_IFD_BIN_PATH="../../blobs/x220/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/x220/me.bin"
-CONFIG_BOARD_LENOVO_X220=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
-CONFIG_NO_POST=y
-CONFIG_GBE_BIN_PATH="../../blobs/x220/gbe.bin"
-#CONFIG_DEBUG_TPM=y
-CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
-CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/x220/bzImage"
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/x220/initrd.cpio.xz"
-CONFIG_DEBUG_SMM_RELOCATION=y