diff --git a/packages.ent b/packages.ent
index 99645f817..d89c301cd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -114,7 +114,6 @@
 <!ENTITY coreutils-fin-du "153 MB">
 <!ENTITY coreutils-fin-sbu "2.6 SBU">
 
-<![ %systemd; [
 <!ENTITY dbus-version "1.12.20">
 <!ENTITY dbus-size "2,048 KB">
 <!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
@@ -122,17 +121,6 @@
 <!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-fin-du "18 MB">
 <!ENTITY dbus-fin-sbu "0.2 SBU">
-]]>
-
-<![ %sysv; [
-<!ENTITY dbus-version "not-used">
-<!ENTITY dbus-size "not-used">
-<!ENTITY dbus-url "not-used">
-<!ENTITY dbus-md5 "not-used">
-<!ENTITY dbus-home "not-used">
-<!ENTITY dbus-fin-du "not-used">
-<!ENTITY dbus-fin-sbu "not-used">
-]]>
 
 <!ENTITY dejagnu-version "1.6.3">
 <!ENTITY dejagnu-size "608 KB">
@@ -168,23 +156,12 @@
 <!ENTITY elfutils-fin-du "115 MB">
 <!ENTITY elfutils-fin-sbu "0.9 SBU">
 
-<![ %sysv; [
 <!ENTITY eudev-version "3.2.10">
 <!ENTITY eudev-size "1,916 KB">
 <!ENTITY eudev-url "https://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
 <!ENTITY eudev-md5 "60b135a189523f333cea5f71a3345c8d">
 <!ENTITY eudev-fin-du "80 MB">
 <!ENTITY eudev-fin-sbu "0.2 SBU">
-]]>
-
-<![ %systemd; [
-<!ENTITY eudev-version "not-used">
-<!ENTITY eudev-size "not-used">
-<!ENTITY eudev-url "not-used">
-<!ENTITY eudev-md5 "not-used">
-<!ENTITY eudev-fin-du "not-used">
-<!ENTITY eudev-fin-sbu "not-used">
-]]>
 
 <!ENTITY expat-version "2.4.1">
 <!ENTITY expat-size "435 KB">
@@ -377,7 +354,6 @@
 <!ENTITY iproute2-fin-du "15 MB">
 <!ENTITY iproute2-fin-sbu "0.2 SBU">
 
-<![ %systemd; [
 <!ENTITY jinja2-version "3.0.1">
 <!ENTITY jinja2-size "264 KB">
 <!ENTITY jinja2-url "https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
@@ -385,17 +361,6 @@
 <!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
 <!ENTITY jinja2-fin-du "3.7 MB">
 <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
-]]>
-
-<![ %sysv; [
-<!ENTITY jinja2-version "not-used">
-<!ENTITY jinja2-size "not-used">
-<!ENTITY jinja2-url "not-used">
-<!ENTITY jinja2-md5 "not-used">
-<!ENTITY jinja2-home "not-used">
-<!ENTITY jinja2-fin-du "not-used">
-<!ENTITY jinja2-fin-sbu "not-used">
-]]>
 
 <!ENTITY kbd-version "2.4.0">
 <!ENTITY kbd-size "1,095 KB">
@@ -421,11 +386,6 @@
 <!ENTITY less-fin-du "4.2 MB">
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!-- For all other packages with conditional entities,
-     the order sysv/systemd is not important.
-     But for lfs-bootscript, sysv must be before systemd, for the
-     sake of make-aux-files.sh -->
-<![ %sysv; [
 <!ENTITY lfs-bootscripts-version "20210608">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
@@ -433,17 +393,6 @@
 <!ENTITY lfs-bootscripts-home " ">
 <!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
-]]>
-
-<![ %systemd; [
-<!ENTITY lfs-bootscripts-version "not-used">
-<!ENTITY lfs-bootscripts-size "not-used">
-<!ENTITY lfs-bootscripts-url "not-used">
-<!ENTITY lfs-bootscripts-md5 "not-used">
-<!ENTITY lfs-bootscripts-home "not-used">
-<!ENTITY lfs-bootscripts-cfg-du "not-used">
-<!ENTITY lfs-bootscripts-cfg-sbu "not-used">
-]]>
 
 <!ENTITY libcap-version "2.57">
 <!ENTITY libcap-size "164 KB">
@@ -534,7 +483,6 @@
 <!ENTITY man-pages-fin-du "33 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<![ %systemd; [
 <!ENTITY markupsafe-version "2.0.1">
 <!ENTITY markupsafe-size "20 KB">
 <!ENTITY markupsafe-url "https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
@@ -542,17 +490,6 @@
 <!ENTITY markupsafe-home "https://markupsafe.palletsprojects.com/en/2.0.x/">
 <!ENTITY markupsafe-fin-du "516 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
-]]>
-
-<![ %sysv; [
-<!ENTITY markupsafe-version "not-used">
-<!ENTITY markupsafe-size "not-used">
-<!ENTITY markupsafe-url "not-used">
-<!ENTITY markupsafe-md5 "not-used">
-<!ENTITY markupsafe-home "not-used">
-<!ENTITY markupsafe-fin-du "not-used">
-<!ENTITY markupsafe-fin-sbu "not-used">
-]]>
 
 <!ENTITY meson-version "0.59.1">
 <!ENTITY meson-size "1,900 KB">
@@ -695,7 +632,6 @@
 <!ENTITY shadow-fin-du "45 MB">
 <!ENTITY shadow-fin-sbu "0.2 SBU">
 
-<![ %sysv; [
 <!ENTITY sysklogd-version "1.5.1">
 <!ENTITY sysklogd-size "88 KB">
 <!ENTITY sysklogd-url "https://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
@@ -703,19 +639,7 @@
 <!ENTITY sysklogd-home "https://www.infodrom.org/projects/sysklogd/">
 <!ENTITY sysklogd-fin-du "0.6 MB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
-]]>
 
-<![ %systemd; [
-<!ENTITY sysklogd-version "not-used">
-<!ENTITY sysklogd-size "not-used">
-<!ENTITY sysklogd-url "not-used">
-<!ENTITY sysklogd-md5 "not-used">
-<!ENTITY sysklogd-home "not-used">
-<!ENTITY sysklogd-fin-du "not-used">
-<!ENTITY sysklogd-fin-sbu "not-used">
-]]>
-
-<![ %systemd; [
 <!ENTITY systemd-version  "249">
 <!--<!ENTITY systemd-stable   "6b4878d">-->
 <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
@@ -732,23 +656,7 @@
 <!ENTITY systemd-man-md5  "d9f2508d6b114b1c02476cd79b8fc786">
 <!ENTITY systemd-fin-du   "277 MB">
 <!ENTITY systemd-fin-sbu  "2.3 SBU">
-]]>
 
-<![ %sysv; [
-<!ENTITY systemd-version  "not-used">
-<!ENTITY systemd-size     "not-used">
-<!ENTITY systemd-url      "not-used">
-<!ENTITY systemd-md5      "not-used">
-<!ENTITY systemd-home     "not-used">
-<!ENTITY systemd-man-version "not-used">
-<!ENTITY systemd-man-size "not-used">
-<!ENTITY systemd-man-url  "not-used">
-<!ENTITY systemd-man-md5  "not-used">
-<!ENTITY systemd-fin-du   "not-used">
-<!ENTITY systemd-fin-sbu  "not-used">
-]]>
-
-<![ %sysv; [
 <!ENTITY sysvinit-version "2.99">
 <!ENTITY sysvinit-size "124 KB">
 <!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
@@ -756,17 +664,6 @@
 <!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
 <!ENTITY sysvinit-fin-du "1.4 MB">
 <!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
-]]>
-
-<![ %systemd; [
-<!ENTITY sysvinit-version "not-used">
-<!ENTITY sysvinit-size "not-used">
-<!ENTITY sysvinit-url "not-used">
-<!ENTITY sysvinit-md5 "not-used">
-<!ENTITY sysvinit-home "not-used">
-<!ENTITY sysvinit-fin-du "not-used">
-<!ENTITY sysvinit-fin-sbu "not-used">
-]]>
 
 <!ENTITY tar-version "1.34">
 <!ENTITY tar-size "2,174 KB">
@@ -806,21 +703,11 @@
 <!ENTITY tzdata-md5 "20eae7d1da671c6eac56339c8df85bbd">
 <!ENTITY tzdata-home "https://www.iana.org/time-zones">
 
-<![ %sysv; [
 <!ENTITY udev-lfs-version "udev-lfs-20171102">
 <!ENTITY udev-lfs-size    "11 KB">
 <!ENTITY udev-lfs-url     "&anduin-sources;/&udev-lfs-version;.tar.xz">
 <!ENTITY udev-lfs-md5     "27cd82f9a61422e186b9d6759ddf1634">
 <!ENTITY udev-lfs-home    " ">
-]]>
-
-<![ %systemd; [
-<!ENTITY udev-lfs-version "not-used">
-<!ENTITY udev-lfs-size    "not-used">
-<!ENTITY udev-lfs-url     "not-used">
-<!ENTITY udev-lfs-md5     "not-used">
-<!ENTITY udev-lfs-home    "not-used">
-]]>
 
 <!ENTITY util-linux-minor "2.37">
 <!ENTITY util-linux-version "2.37.2"> <!-- 2.33.x -->