diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service
index 9e72843..3a56e6e 100644
--- a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service
@@ -12,7 +12,7 @@ ConditionKernelCommandLine=|citadel.live
 # Only run if root is set to this exact path
 ConditionKernelCommandLine=root=/dev/mapper/rootfs
 
-Wants=citadel-rootfs-setup.service citadel-install-rootfs-setup.service
+Wants=citadel-rootfs-setup.service
 
 Requires=systemd-sysctl.service
 After=systemd-sysctl.service
diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service
deleted file mode 100644
index adf48ce..0000000
--- a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Set up citadel for install/live boot
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=sysroot.mount citadel-rootfs-setup.service
-Requires=sysroot.mount citadel-rootfs-setup.service
-Before=initrd-root-fs.target shutdown.target
-AssertPathExists=/etc/initrd-release
-
-# Only run in install or live modes 
-ConditionKernelCommandLine=|citadel.install
-ConditionKernelCommandLine=|citadel.live
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStartPre=-/usr/bin/plymouth message --text="Setting up filesystem in RAM for live boot"
-ExecStart=/usr/libexec/citadel-boot setup
-ExecStartPost=-/usr/bin/plymouth message --text="Starting desktop"