diff --git a/config/modules/power-management/rfkill-sleep.nix b/config/modules/power-management/rfkill-sleep.nix
index 545bb06..d9c6057 100644
--- a/config/modules/power-management/rfkill-sleep.nix
+++ b/config/modules/power-management/rfkill-sleep.nix
@@ -3,14 +3,6 @@
   modules.rfkill-sleep = {
     nixos =
       { pkgs, ... }:
-      let
-        sleep-rfkill = pkgs.writeShellScript "sleep-rfkill" "
-				${pkgs.util-linux}/bin/rfkill block all
-				";
-        wake-rfkill = pkgs.writeShellScript "wake-rfkill" "
-				${pkgs.util-linux}/bin/rfkill unblock all
-				";
-      in
       {
         # My laptop doesn't like having connectivity when it goes to sleep, it burns through battery
         systemd.services.sleep-rfkill = {
@@ -20,10 +12,13 @@
           serviceConfig = {
             Type = "oneshot";
             # Command to run BEFORE system suspends
-            ExecStart = "${pkgs.util-linux}/bin/rfkill block all; ${pkgs.bash}/bin/bash -c 'echo \"$(date): Suspending... \" >> /home/doloro/sleep.log'";
+            ExecStart = "${pkgs.util-linux}/bin/rfkill block all";
             # Command to run AFTER system resumes
-            ExecStop = "${pkgs.util-linux}/bin/rfkill unblock all; ${pkgs.bash}/bin/bash -c 'echo \"$(date): Resumed!  \" >> /home/doloro/sleep.log'";
-            RemainAfterExit = false;
+            ExecStop = "${pkgs.util-linux}/bin/rfkill unblock all";
+            RemainAfterExit = true;
+          };
+          unitConfig = {
+            StopWhenUnneeded = true;
           };
         };
       };