diff --git a/flake.lock b/flake.lock
index 2d34fc0..3727ee4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,27 +69,6 @@
         "type": "github"
       }
     },
-    "cup-collector": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1779501140,
-        "narHash": "sha256-0azy6r62B0Q2HDhVNizduriej0l4QVjlgljKotqoexQ=",
-        "owner": "genebean",
-        "repo": "cup-collector",
-        "rev": "b68ca178621b126a1cbe40de59065983fcd9d388",
-        "type": "github"
-      },
-      "original": {
-        "owner": "genebean",
-        "repo": "cup-collector",
-        "type": "github"
-      }
-    },
     "deadnix": {
       "inputs": {
         "nixpkgs": [
@@ -256,24 +235,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flox": {
       "inputs": {
         "crane": "crane",
@@ -755,7 +716,6 @@
     "root": {
       "inputs": {
         "compose2nix": "compose2nix",
-        "cup-collector": "cup-collector",
         "deadnix": "deadnix",
         "disko": "disko",
         "flox": "flox",
@@ -911,21 +871,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
@@ -946,7 +891,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1731533236,
diff --git a/flake.nix b/flake.nix
index 15e65d4..898323d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,11 +11,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    cup-collector = {
-      url = "github:genebean/cup-collector";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # Linting and formatting
     deadnix = {
       url = "github:astro/deadnix";
@@ -178,7 +173,6 @@
         nixnuc = localLib.mkNixosHost {
           hostname = "nixnuc";
           additionalModules = [
-            inputs.cup-collector.nixosModules.default
             inputs.private-flake.nixosModules.private.nixnuc
             inputs.simple-nixos-mailserver.nixosModule
           ];
diff --git a/modules/hosts/darwin/default.nix b/modules/hosts/darwin/default.nix
index 5fe5531..38765c5 100644
--- a/modules/hosts/darwin/default.nix
+++ b/modules/hosts/darwin/default.nix
@@ -99,7 +99,6 @@
       "BetterSnapTool" = 417375580;
       "Brother iPrint&Scan" = 1193539993;
       "Home Assistant" = 1099568401;
-      "LocalSend" = 1661733229;
       "MQTT Explorer" = 1455214828;
     };
   };
@@ -110,7 +109,6 @@
     settings = {
       bash-prompt-prefix = "(nix:$name)\040";
       build-users-group = "nixbld";
-      download-buffer-size = 524288000;
       experimental-features = [
         "auto-allocate-uids"
         "flakes"
diff --git a/modules/hosts/nixos/nixnuc/cup-collector.nix b/modules/hosts/nixos/nixnuc/cup-collector.nix
deleted file mode 100644
index 24fdaa9..0000000
--- a/modules/hosts/nixos/nixnuc/cup-collector.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}:
-let
-  home_domain = "home.technicalissues.us";
-in
-{
-  services = {
-    cupCollector = {
-      enable = true;
-      # dataDir = "/var/lib/cup-collector";
-      domain = "cups.${home_domain}";
-      envFile = config.sops.secrets.cup_collector_env.path;
-      households = [
-        {
-          name = "Liverman Family";
-          slug = "liverman_family";
-        }
-      ];
-      migrationsDir = inputs.cup-collector.packages.${pkgs.stdenv.hostPlatform.system}.migrations;
-      pbBindIp = "0.0.0.0";
-      pbPort = 8091; # override default due to conflict
-      pocketidIssuerUrl = config.services.pocket-id.settings.APP_URL;
-      port = 3010; # override default due to conflict
-    };
-
-    restic.backups.daily = {
-      paths = [
-        config.services.cupCollector.dataDir
-      ];
-    };
-  };
-
-  sops = {
-    defaultSopsFile = ./secrets.yaml;
-    secrets.cup_collector_env.restartUnits = [
-      "cup-collector-pb-init.service"
-      "cup-collector.service"
-    ];
-  };
-}
diff --git a/modules/hosts/nixos/nixnuc/default.nix b/modules/hosts/nixos/nixnuc/default.nix
index dc6b924..70ca597 100644
--- a/modules/hosts/nixos/nixnuc/default.nix
+++ b/modules/hosts/nixos/nixnuc/default.nix
@@ -17,7 +17,6 @@ in
     ./containers/audiobookshelf.nix
     ./containers/mountain-mesh-bot-discord.nix
     ./containers/psitransfer.nix
-    ./cup-collector.nix
     ./monitoring-stack.nix
     ../../../shared/nixos/lets-encrypt.nix
     ../../../shared/nixos/restic.nix
@@ -99,14 +98,12 @@ in
         3002 # grafana
         3005 # Firefly III
         3006 # Firefly III Data Importer
-        3010 # Cup Collector
         3030 # Forgejo
         3087 # Youtarr in docker compose
         8001 # Tube Archivist
         8384 # Syncthing gui
         8888 # Atuin
         8090 # Wallabag in docker compose
-        8091 # PocketBase
         8945 # Pinchflat
         13378 # Audiobookshelf in oci-container
       ];
@@ -149,6 +146,13 @@ in
 
   # List services that you want to enable:
   services = {
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+    pulseaudio.enable = false;
     atuin = {
       enable = true;
       host = "127.0.0.1";
@@ -590,12 +594,6 @@ in
       selfhosted = true; # Only because this is not exsposed to the web
       user = "jellyfin";
     };
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
     pocket-id = {
       enable = true;
       settings = {
@@ -619,7 +617,6 @@ in
       backupAll = true;
       startAt = "*-*-* 23:00:00";
     };
-    pulseaudio.enable = false;
     resolved.enable = true;
     restic.backups.daily = {
       paths = [