diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix
index 528d06b..a5358c5 100644
--- a/modules/home/home/default.nix
+++ b/modules/home/home/default.nix
@@ -52,13 +52,15 @@ in
             mission-center
             parted
             vesktop
-          ] ++ (
-            if !isArm then 
+          ]
+          ++ (
+            if !isArm then
               [
                 # goverlay
                 # winboat
               ]
-            else [ ]
+            else
+              [ ]
           )
         else
           [ ]
@@ -71,7 +73,7 @@ in
     nix-index-database.comma = enabled;
     btop = {
       enable = lib.mkDefault true;
-      package = pkgs.unstable.btop;
+      package = pkgs.btop;
     };
     fastfetch = lib.mkDefault enabled;
     home-manager = lib.mkDefault enabled;
diff --git a/modules/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix
index bc09da6..764a29d 100755
--- a/modules/nixos/gaming/default.nix
+++ b/modules/nixos/gaming/default.nix
@@ -38,17 +38,15 @@ in
       remotePlay.openFirewall = true;
       # Open ports in the firewall for Source Dedicated Server
       dedicatedServer.openFirewall = true;
-      extraCompatPackages =
-        with pkgs.unstable;
-        [
-          proton-ge-bin
-        ]
-        ++ (with pkgs.${namespace}; [
-          proton-cachyos
-          proton-cachyos-v3
-          proton-cachyos-v2
-          proton-cachyos-v1
-        ]);
+      extraCompatPackages = [
+        pkgs.proton-ge-bin
+      ]
+      ++ (with pkgs.${namespace}; [
+        proton-cachyos
+        proton-cachyos-v3
+        proton-cachyos-v2
+        proton-cachyos-v1
+      ]);
       gamescopeSession = lib.mkDefault {
         enable = true;
         args = [
diff --git a/modules/nixos/services/ai/default.nix b/modules/nixos/services/ai/default.nix
index e5aa663..3094b60 100755
--- a/modules/nixos/services/ai/default.nix
+++ b/modules/nixos/services/ai/default.nix
@@ -72,7 +72,7 @@ let
 
         open-webui = {
           enable = true;
-          package = pkgs.unstable.open-webui;
+          package = pkgs.open-webui;
           host = "0.0.0.0";
           port = 8888;
           openFirewall = cfg.openFirewall;
diff --git a/modules/nixos/services/arrs/default.nix b/modules/nixos/services/arrs/default.nix
index f54d07f..9567fb5 100644
--- a/modules/nixos/services/arrs/default.nix
+++ b/modules/nixos/services/arrs/default.nix
@@ -70,7 +70,7 @@ let
         user = "nix-apps";
         group = "jallen-nas";
         dataDir = "${cfg.configDir}/sonarr";
-        package = pkgs.unstable.sonarr;
+        package = pkgs.sonarr;
       };
 
       # Enable Sabnzbd service
diff --git a/overlays/linux-rpi/default.nix b/overlays/linux-rpi/default.nix
index 1bccd70..31c2bd9 100644
--- a/overlays/linux-rpi/default.nix
+++ b/overlays/linux-rpi/default.nix
@@ -2,34 +2,14 @@
   namespace,
   ...
 }:
-
 final: prev:
 let
-  ubootPackages = final.callPackage ../../packages/uboot { };
-
-  # fetchFromGitHub = inputs.nixpkgs.fetchFromGitHub;
-
-  # linux618Src = fetchFromGitHub {
-  #   owner = "raspberrypi";
-  #   repo = "linux";
-  #   rev = "bb594fb36f555f9b88b7b6fcf8b71c669c1d60c7";
-  #   hash = "sha256-T3RJRroYtzLwx4JqcaX15Ka1uVf72jQOZMf7TJVZ6co=";
-  # };
-
-  # linux619Src = fetchFromGitHub {
-  #   owner = "raspberrypi";
-  #   repo = "linux";
-  #   rev = "87e52a7868888c66b2782c949c8406c27f909c11";
-  #   hash = "sha256-C81aKv+pQYNx6Bj3PL0vrxvBzrLB99+95YeIBm+4kt0=";
-  # };
-
   linux-rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi);
   linux-rpi5-latest = final.linuxPackagesFor (
     final.${namespace}.linux-rpi.override {
       kernelVersion = "unstable";
     }
   );
-
   linux-rpi4 = final.linuxPackagesFor (
     final.${namespace}.linux-rpi.override {
       rpiVersion = 4;
@@ -38,23 +18,8 @@ let
 in
 {
   ${namespace} = prev.${namespace} // {
-    uboot-pi5 = ubootPackages.ubootRaspberryPi5;
-    uboot-pi4 = ubootPackages.ubootRaspberryPi4;
-
     linuxPackages_rpi5-lts = linux-rpi5;
     linuxPackages_rpi4-lts = linux-rpi4;
     linuxPackages_rpi5-latest = linux-rpi5-latest;
-    # linuxPackages_rpi5-rc = linux-rpi5.overrideAttrs (_old: {
-    #   modDirVersion = "6.19.0-rc5";
-    #   src = linux619Src;
-    # });
-    # linuxPackages_rpi4-latest = linux-rpi4.overrideAttrs (_old: {
-    #   modDirVersion = "6.18.4";
-    #   src = linux618Src;
-    # });
-    # linuxPackages_rpi4-rc = linux-rpi4.overrideAttrs (_old: {
-    #   modDirVersion = "6.19.0-rc5";
-    #   src = linux619Src;
-    # });
   };
 }
diff --git a/overlays/mjallen-lib/default.nix b/overlays/mjallen-lib/default.nix
deleted file mode 100644
index ba740b8..0000000
--- a/overlays/mjallen-lib/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ inputs, ... }:
-_final: _prev: {
-  mjallen-lib = (import ../../lib { inherit inputs; }).mjallen-lib;
-}
diff --git a/overlays/unstable/default.nix b/overlays/unstable/default.nix
deleted file mode 100644
index 8d068f9..0000000
--- a/overlays/unstable/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ inputs, ... }:
-final: _prev: {
-  unstable = import inputs.nixpkgs-unstable {
-    system = final.stdenv.hostPlatform.system;
-    config.allowUnfree = true;
-  };
-}