diff --git a/.gitmodules b/.gitmodules
index 63b08d4..9451b18 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = coreboot
 	url = https://github.com/system76/coreboot.git
 	branch = system76
-[submodule "edk2-platforms"]
-	path = edk2-platforms
-	url = https://github.com/system76/edk2-platforms.git
-	branch = system76
 [submodule "tools/UEFITool"]
 	path = tools/UEFITool
 	url = https://github.com/LongSoft/UEFITool.git
@@ -54,14 +50,6 @@
 	path = apps/gop-policy
 	url = https://github.com/system76/gop-policy.git
 	branch = master
-[submodule "edk2-non-osi"]
-	path = edk2-non-osi
-	url = https://github.com/tianocore/edk2-non-osi.git
-	branch = devel-MinPlatform
-[submodule "FSP"]
-	path = FSP
-	url = https://github.com/IntelFsp/FSP.git
-	branch = master
 [submodule "tools/ipxe"]
 	path = tools/ipxe
 	url = https://github.com/ipxe/ipxe.git
diff --git a/FSP b/FSP
deleted file mode 160000
index 81dd505..0000000
--- a/FSP
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81dd5055f4c75db7c7b3d69fbc00c218a329bfa4
diff --git a/edk2-non-osi b/edk2-non-osi
deleted file mode 160000
index 88ec4bf..0000000
--- a/edk2-non-osi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 88ec4bf04c24ad3f02f71c70969075e9e9ab93ab
diff --git a/edk2-platforms b/edk2-platforms
deleted file mode 160000
index 3176197..0000000
--- a/edk2-platforms
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 317619784482159fab892f4649c01b4b7be404c4
diff --git a/scripts/build.sh b/scripts/build.sh
index 01ca5df..a63de80 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -69,8 +69,8 @@ then
     done < "${MODEL_DIR}/edk2.config"
 fi
 
-# Rebuild CorebootPayloadPkg using edk2
-PACKAGES_PATH="${MODEL_DIR}:$(realpath edk2-platforms):$(realpath apps)" \
+# Rebuild UefiPayloadPkg using edk2
+PACKAGES_PATH="${MODEL_DIR}:$(realpath apps)" \
     ./scripts/_build/edk2.sh \
         "${UEFIPAYLOAD}" \
         "${EDK2_ARGS[@]}"
diff --git a/scripts/minplatform.sh b/scripts/minplatform.sh
deleted file mode 100755
index 97a709a..0000000
--- a/scripts/minplatform.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ -z "$1" ]
-then
-  echo "$0 [model]" >&2
-  exit 1
-fi
-MODEL="$1"
-
-if [ ! -d "models/${MODEL}" ]
-then
-  echo "model '${MODEL}' not found" >&2
-  exit 1
-fi
-MODEL_DIR="$(realpath "models/${MODEL}")"
-
-case "${MODEL}" in
-  galp3 | galp3-b)
-    PLATFORM=GalagoPro3
-    ;;
-  *)
-    echo "model '${MODEL}' has no matching platform" >&2
-    exit 1
-    ;;
-esac
-
-rm -rf "build/${MODEL}"
-mkdir -p "build/${MODEL}"
-
-# Copy correct VBT
-mkdir -p "build/${MODEL}/${PLATFORM}/Gop"
-cp -v "models/${MODEL}/vbt.rom" "build/${MODEL}/${PLATFORM}/Gop/Vbt.bin"
-
-export PACKAGES_PATH="\
-$(realpath "build/${MODEL}"):\
-$(realpath edk2-platforms/Platform/Intel):\
-$(realpath edk2-platforms/Silicon/Intel):\
-$(realpath edk2-non-osi/Silicon/Intel):\
-$(realpath FSP)"
-
-pushd edk2 >/dev/null
-  make -C BaseTools --jobs="$(nproc)"
-  source edksetup.sh --reconfig
-popd >/dev/null
-
-pushd edk2-platforms/Platform/Intel >/dev/null
-  python3 build_bios.py \
-    --platform "${PLATFORM}" \
-    --RELEASE
-popd >/dev/null
diff --git a/scripts/remotes.sh b/scripts/remotes.sh
index f7d873b..8c1b0ee 100755
--- a/scripts/remotes.sh
+++ b/scripts/remotes.sh
@@ -4,7 +4,6 @@ REMOTES=(
     "coreboot upstream https://github.com/coreboot/coreboot.git"
     "edk2 upstream https://github.com/tianocore/edk2.git"
     "edk2 mrchromebox https://github.com/MrChromebox/edk2.git"
-    "edk2-platforms upstream https://github.com/tianocore/edk2-platforms.git"
 )
 
 set -e
diff --git a/scripts/udk-debug.gdb b/scripts/udk-debug.gdb
deleted file mode 100755
index 73fea73..0000000
--- a/scripts/udk-debug.gdb
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/gdb -x
-target remote :1234
-source /opt/intel/udkdebugger/script/udk_gdb_script
-iowatch/b 0x80
diff --git a/scripts/udk-output.sh b/scripts/udk-output.sh
deleted file mode 100755
index a1fa661..0000000
--- a/scripts/udk-output.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-nc localhost 20715
diff --git a/scripts/udk-server.sh b/scripts/udk-server.sh
deleted file mode 100755
index c8427b5..0000000
--- a/scripts/udk-server.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-while true
-do
-    /opt/intel/udkdebugger/bin/udk-gdb-server
-    sleep 10
-done
diff --git a/scripts/udk.sh b/scripts/udk.sh
deleted file mode 100755
index e43723a..0000000
--- a/scripts/udk.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
-
-echo "## Launching UDK ##"
-./scripts/udk-server.sh &
-
-while true
-do
-    if lsof -Pi :20715 -sTCP:LISTEN -t >/dev/null
-    then
-        break
-    fi
-    sleep 1
-done
-
-echo "## Launching NC ##"
-./scripts/udk-output.sh &
-
-while true
-do
-    if lsof -Pi :1234 -sTCP:LISTEN -t >/dev/null
-    then
-        break
-    fi
-    sleep 1
-done
-
-echo "## Launching GDB ##"
-./scripts/udk-debug.gdb