6 files changed, 3 insertions, 6 deletions
diff --git a/units/debian/umountfs.service b/units/debian/umountfs.service
index 804db88538..1ae58574ee 100644
--- a/units/debian/umountfs.service
+++ b/units/debian/umountfs.service
@@ -8,7 +8,6 @@
 [Unit]
 Description=Turn off swap and umount all local file systems
 DefaultDependencies=no
-After=killall.service
 Before=reboot.service poweroff.service halt.service umountroot.service
 
 [Service]
diff --git a/units/debian/umountnfs.service b/units/debian/umountnfs.service
index 598c3d4fb9..32f32d10db 100644
--- a/units/debian/umountnfs.service
+++ b/units/debian/umountnfs.service
@@ -8,7 +8,6 @@
 [Unit]
 Description=Umount all network file systems
 DefaultDependencies=no
-After=killall.service
 Before=reboot.service poweroff.service halt.service umountfs.service
 
 [Service]
diff --git a/units/debian/umountroot.service b/units/debian/umountroot.service
index 5d11602286..4e0b87d846 100644
--- a/units/debian/umountroot.service
+++ b/units/debian/umountroot.service
@@ -8,7 +8,6 @@
 [Unit]
 Description=Mount the root file system read-only
 DefaultDependencies=no
-After=killall.service
 Before=reboot.service poweroff.service halt.service
 
 [Service]
diff --git a/units/fedora/plymouth-halt.service b/units/fedora/plymouth-halt.service
index 69a9197544..e0276293fb 100644
--- a/units/fedora/plymouth-halt.service
+++ b/units/fedora/plymouth-halt.service
@@ -8,7 +8,7 @@
 [Unit]
 Description=Show Plymouth Halt Screen
 After=getty@tty1.service prefdm.service
-Before=killall.service halt.service
+Before=halt.service
 DefaultDependencies=no
 
 [Service]
diff --git a/units/fedora/plymouth-poweroff.service b/units/fedora/plymouth-poweroff.service
index be699ba00d..fb6f9aed30 100644
--- a/units/fedora/plymouth-poweroff.service
+++ b/units/fedora/plymouth-poweroff.service
@@ -8,7 +8,7 @@
 [Unit]
 Description=Show Plymouth Power Off Screen
 After=getty@tty1.service prefdm.service
-Before=killall.service poweroff.service
+Before=poweroff.service
 DefaultDependencies=no
 
 [Service]
diff --git a/units/fedora/plymouth-reboot.service b/units/fedora/plymouth-reboot.service
index 5d252ada3a..e73de409b9 100644
--- a/units/fedora/plymouth-reboot.service
+++ b/units/fedora/plymouth-reboot.service
@@ -8,7 +8,7 @@
 [Unit]
 Description=Show Plymouth Reboot Screen
 After=getty@tty1.service prefdm.service
-Before=killall.service reboot.service
+Before=reboot.service
 DefaultDependencies=no
 
 [Service]