diff --git a/releases/specs-qemu/mips/stage1-mips2-o32-musl.spec b/releases/specs-qemu/mips/stage1-mips2-o32-musl.spec
deleted file mode 100644
index 71e930cd..00000000
--- a/releases/specs-qemu/mips/stage1-mips2-o32-musl.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips2_musl
-target: stage1
-version_stamp: @TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: musl
-profile: default/linux/mips/17.0/o32/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage3-mips2_musl-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips2-o32-openrc.spec b/releases/specs-qemu/mips/stage1-mips2-o32-openrc.spec
deleted file mode 100644
index 7ecbdc44..00000000
--- a/releases/specs-qemu/mips/stage1-mips2-o32-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips2
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: default
-profile: default/linux/mips/17.0/o32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mips2-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips2-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips2-o32-systemd-mu.spec
deleted file mode 100644
index 4a1ab16e..00000000
--- a/releases/specs-qemu/mips/stage1-mips2-o32-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips2
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: mergedusr
-profile: default/linux/mips/17.0/o32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mips2-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-openrc.spec b/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-openrc.spec
deleted file mode 100644
index a489a29e..00000000
--- a/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips2_softfloat
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: default
-profile: default/linux/mips/17.0/o32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mips2_softfloat-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-systemd-mu.spec
deleted file mode 100644
index 9e5af689..00000000
--- a/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips2_softfloat
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: mergedusr
-profile: default/linux/mips/17.0/o32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mips2_softfloat-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips3-multilib-openrc.spec b/releases/specs-qemu/mips/stage1-mips3-multilib-openrc.spec
deleted file mode 100644
index 51fdacad..00000000
--- a/releases/specs-qemu/mips/stage1-mips3-multilib-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips3_multilib
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32 /usr/bin/qemu-mips /usr/bin/qemu-mips64
-rel_type: default
-profile: default/linux/mips/17.0/multilib/n32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mips3_multilib-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips3-multilib-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips3-multilib-systemd-mu.spec
deleted file mode 100644
index ca71497b..00000000
--- a/releases/specs-qemu/mips/stage1-mips3-multilib-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips3_multilib
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32 /usr/bin/qemu-mips /usr/bin/qemu-mips64
-rel_type: mergedusr
-profile: default/linux/mips/17.0/multilib/n32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mips3_multilib-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips3-n32-openrc.spec b/releases/specs-qemu/mips/stage1-mips3-n32-openrc.spec
deleted file mode 100644
index 41c9c881..00000000
--- a/releases/specs-qemu/mips/stage1-mips3-n32-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips3_n32
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32
-rel_type: default
-profile: default/linux/mips/17.0/n32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mips3_n32-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips3-n32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips3-n32-systemd-mu.spec
deleted file mode 100644
index 2694d4df..00000000
--- a/releases/specs-qemu/mips/stage1-mips3-n32-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips3_n32
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32
-rel_type: mergedusr
-profile: default/linux/mips/17.0/n32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mips3_n32-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips3-n64-openrc.spec b/releases/specs-qemu/mips/stage1-mips3-n64-openrc.spec
deleted file mode 100644
index 0313d4c1..00000000
--- a/releases/specs-qemu/mips/stage1-mips3-n64-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips3_n64
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips64
-rel_type: default
-profile: default/linux/mips/17.0/n64
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mips3_n64-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mips3-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips3-n64-systemd-mu.spec
deleted file mode 100644
index b7b79ca7..00000000
--- a/releases/specs-qemu/mips/stage1-mips3-n64-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mips3_n64
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips64
-rel_type: mergedusr
-profile: default/linux/mips/17.0/n64/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mips3_n64-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel2-o32-musl.spec b/releases/specs-qemu/mips/stage1-mipsel2-o32-musl.spec
deleted file mode 100644
index 3d043db8..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel2-o32-musl.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel2_musl
-target: stage1
-version_stamp: @TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: musl
-profile: default/linux/mips/17.0/mipsel/o32/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage3-mipsel2_musl-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel2-o32-openrc.spec b/releases/specs-qemu/mips/stage1-mipsel2-o32-openrc.spec
deleted file mode 100644
index 8c929b98..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel2-o32-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel2
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/o32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mipsel2-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec
deleted file mode 100644
index 5ad3d3b3..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel2
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mipsel2-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-openrc.spec b/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-openrc.spec
deleted file mode 100644
index 483450e2..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel2_softfloat
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/o32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mipsel2_softfloat-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-systemd-mu.spec
deleted file mode 100644
index ba76fac0..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel2_softfloat
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mipsel2_softfloat-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-multilib-openrc.spec b/releases/specs-qemu/mips/stage1-mipsel3-multilib-openrc.spec
deleted file mode 100644
index d619c1a4..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel3-multilib-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel3_multilib
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32el /usr/bin/qemu-mipsel /usr/bin/qemu-mips64el
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/multilib/n32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mipsel3_multilib-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-multilib-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel3-multilib-systemd-mu.spec
deleted file mode 100644
index ddb2f37b..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel3-multilib-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel3_multilib
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32el /usr/bin/qemu-mipsel /usr/bin/qemu-mips64el
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mipsel3_multilib-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-n32-openrc.spec b/releases/specs-qemu/mips/stage1-mipsel3-n32-openrc.spec
deleted file mode 100644
index 6bd09825..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel3-n32-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel3_n32
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32el
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/n32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mipsel3_n32-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec
deleted file mode 100644
index 0b63e50e..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel3_n32
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32el
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/n32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mipsel3_n32-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-n64-openrc.spec b/releases/specs-qemu/mips/stage1-mipsel3-n64-openrc.spec
deleted file mode 100644
index 6d45e15d..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel3-n64-openrc.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel3_n64
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips64el
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/n64
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-mipsel3_n64-openrc-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel3-n64-systemd-mu.spec
deleted file mode 100644
index 1885a123..00000000
--- a/releases/specs-qemu/mips/stage1-mipsel3-n64-systemd-mu.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-subarch: mipsel3_n64
-target: stage1
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips64el
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/n64/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage3-mipsel3_n64-systemd-mergedusr-latest
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage3-mips2-o32-musl.spec b/releases/specs-qemu/mips/stage3-mips2-o32-musl.spec
deleted file mode 100644
index 1088678e..00000000
--- a/releases/specs-qemu/mips/stage3-mips2-o32-musl.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips2_musl
-target: stage3
-version_stamp: @TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: musl
-profile: default/linux/mips/17.0/o32/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage1-mips2_musl-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips2_o32_musl
diff --git a/releases/specs-qemu/mips/stage3-mips2-o32-openrc.spec b/releases/specs-qemu/mips/stage3-mips2-o32-openrc.spec
deleted file mode 100644
index 058938c5..00000000
--- a/releases/specs-qemu/mips/stage3-mips2-o32-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips2
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: default
-profile: default/linux/mips/17.0/o32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mips2-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips2_o32
diff --git a/releases/specs-qemu/mips/stage3-mips2-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips2-o32-systemd-mu.spec
deleted file mode 100644
index 51b94d5e..00000000
--- a/releases/specs-qemu/mips/stage3-mips2-o32-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips2
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: mergedusr
-profile: default/linux/mips/17.0/o32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mips2-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips2_o32
diff --git a/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-openrc.spec b/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-openrc.spec
deleted file mode 100644
index 179bbbdc..00000000
--- a/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips2_softfloat
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: default
-profile: default/linux/mips/17.0/o32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mips2_softfloat-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips2_o32_softfloat
diff --git a/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-systemd-mu.spec
deleted file mode 100644
index 1bdad379..00000000
--- a/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips2_softfloat
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips
-rel_type: mergedusr
-profile: default/linux/mips/17.0/o32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mips2_softfloat-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips2_o32_softfloat
diff --git a/releases/specs-qemu/mips/stage3-mips3-multilib-openrc.spec b/releases/specs-qemu/mips/stage3-mips3-multilib-openrc.spec
deleted file mode 100644
index 8dcffc52..00000000
--- a/releases/specs-qemu/mips/stage3-mips3-multilib-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips3_multilib
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32 /usr/bin/qemu-mips /usr/bin/qemu-mips64
-rel_type: default
-profile: default/linux/mips/17.0/multilib/n32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mips3_multilib-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips3_multilib
diff --git a/releases/specs-qemu/mips/stage3-mips3-multilib-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips3-multilib-systemd-mu.spec
deleted file mode 100644
index ce1fff56..00000000
--- a/releases/specs-qemu/mips/stage3-mips3-multilib-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips3_multilib
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32 /usr/bin/qemu-mips /usr/bin/qemu-mips64
-rel_type: mergedusr
-profile: default/linux/mips/17.0/multilib/n32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mips3_multilib-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips3_multilib
diff --git a/releases/specs-qemu/mips/stage3-mips3-n32-openrc.spec b/releases/specs-qemu/mips/stage3-mips3-n32-openrc.spec
deleted file mode 100644
index 747c4359..00000000
--- a/releases/specs-qemu/mips/stage3-mips3-n32-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips3_n32
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32
-rel_type: default
-profile: default/linux/mips/17.0/n32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mips3_n32-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips3_n32
diff --git a/releases/specs-qemu/mips/stage3-mips3-n32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips3-n32-systemd-mu.spec
deleted file mode 100644
index d50fc54a..00000000
--- a/releases/specs-qemu/mips/stage3-mips3-n32-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips3_n32
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32
-rel_type: mergedusr
-profile: default/linux/mips/17.0/n32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mips3_n32-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips3_n32
diff --git a/releases/specs-qemu/mips/stage3-mips3-n64-openrc.spec b/releases/specs-qemu/mips/stage3-mips3-n64-openrc.spec
deleted file mode 100644
index 37dca772..00000000
--- a/releases/specs-qemu/mips/stage3-mips3-n64-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips3_n64
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips64
-rel_type: default
-profile: default/linux/mips/17.0/n64
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mips3_n64-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips3_n64
diff --git a/releases/specs-qemu/mips/stage3-mips3-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips3-n64-systemd-mu.spec
deleted file mode 100644
index 6b868781..00000000
--- a/releases/specs-qemu/mips/stage3-mips3-n64-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mips3_n64
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips64
-rel_type: mergedusr
-profile: default/linux/mips/17.0/n64/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mips3_n64-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mips3_n64
diff --git a/releases/specs-qemu/mips/stage3-mipsel2-o32-musl.spec b/releases/specs-qemu/mips/stage3-mipsel2-o32-musl.spec
deleted file mode 100644
index 28cb6c1f..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel2-o32-musl.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel2_musl
-target: stage3
-version_stamp: @TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: musl
-profile: default/linux/mips/17.0/mipsel/o32/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage1-mipsel2_musl-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel2_o32_musl
diff --git a/releases/specs-qemu/mips/stage3-mipsel2-o32-openrc.spec b/releases/specs-qemu/mips/stage3-mipsel2-o32-openrc.spec
deleted file mode 100644
index a9f2f457..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel2-o32-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel2
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/o32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mipsel2-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel2_o32
diff --git a/releases/specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec
deleted file mode 100644
index 7b908c11..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel2
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mipsel2-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel2_o32
diff --git a/releases/specs-qemu/mips/stage3-mipsel2_softfloat-o32-openrc.spec b/releases/specs-qemu/mips/stage3-mipsel2_softfloat-o32-openrc.spec
deleted file mode 100644
index 179ed28c..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel2_softfloat-o32-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel2_softfloat
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/o32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mipsel2_softfloat-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel2_o32_softfloat
diff --git a/releases/specs-qemu/mips/stage3-mipsel2_softfloat-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel2_softfloat-o32-systemd-mu.spec
deleted file mode 100644
index 1324d42f..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel2_softfloat-o32-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel2_softfloat
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsel
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mipsel2_softfloat-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel2_o32_softfloat
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-multilib-openrc.spec b/releases/specs-qemu/mips/stage3-mipsel3-multilib-openrc.spec
deleted file mode 100644
index 49dc5faa..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel3-multilib-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel3_multilib
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32el /usr/bin/qemu-mipsel /usr/bin/qemu-mips64el
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/multilib/n32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mipsel3_multilib-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel3_multilib
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-multilib-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel3-multilib-systemd-mu.spec
deleted file mode 100644
index 4b045b38..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel3-multilib-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel3_multilib
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32el /usr/bin/qemu-mipsel /usr/bin/qemu-mips64el
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mipsel3_multilib-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel3_multilib
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-n32-openrc.spec b/releases/specs-qemu/mips/stage3-mipsel3-n32-openrc.spec
deleted file mode 100644
index f18044b5..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel3-n32-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel3_n32
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32el
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/n32
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mipsel3_n32-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel3_n32
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec
deleted file mode 100644
index 0f0e0185..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel3_n32
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mipsn32el
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/n32/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mipsel3_n32-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel3_n32
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-n64-openrc.spec b/releases/specs-qemu/mips/stage3-mipsel3-n64-openrc.spec
deleted file mode 100644
index a1e6b563..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel3-n64-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel3_n64
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips64el
-rel_type: default
-profile: default/linux/mips/17.0/mipsel/n64
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-mipsel3_n64-openrc-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel3_n64
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel3-n64-systemd-mu.spec
deleted file mode 100644
index 9db6c818..00000000
--- a/releases/specs-qemu/mips/stage3-mipsel3-n64-systemd-mu.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: mipsel3_n64
-target: stage3
-version_stamp: systemd-mergedusr-@TIMESTAMP@
-interpreter: /usr/bin/qemu-mips64el
-rel_type: mergedusr
-profile: default/linux/mips/17.0/mipsel/n64/systemd/merged-usr
-snapshot_treeish: @TREEISH@
-source_subpath: mergedusr/stage1-mipsel3_n64-systemd-mergedusr-@TIMESTAMP@
-compression_mode: pixz
-decompressor_search_order: xz bzip2
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-binrepo_path: mips/binpackages/17.0/mipsel3_n64