diff --git a/bert/README.md b/bert/README.md
index 5fc22b6..a09d035 100644
--- a/bert/README.md
+++ b/bert/README.md
@@ -5,7 +5,12 @@
 3. Deploy updated config with `make`
 4. Set up [Remote Disk Unlocking](https://nixos.wiki/wiki/Remote_disk_unlocking)
    1. mkdir -p /etc/secrets/initrd && ssh-keygen -N "" -f /etc/secrets/initrd/ssh_host_25519_key
-5. Deploy content to web services
+5. Deploy content:
+   - websites in /srv
+   - factorio world at /var/lib/factorio/saves/default.zip
+   - git/forgejo in /var/lib/forgejo
+   - navidrome
+6. Set up Grafana users (log in with default admin/admin; change creds; configure)
 
 # Notes on Caddy
 Until 2.8 is released with 24.11, Caddy has a pretty limited sense of what
diff --git a/bert/configuration.nix b/bert/configuration.nix
index c541597..c475e2a 100644
--- a/bert/configuration.nix
+++ b/bert/configuration.nix
@@ -8,7 +8,6 @@
       ./services/http/index.nix
       ./services/monitoring.nix
       ./services/forgejo.nix
-      ./services/navidrome.nix
     ];
 
   # Bootloader
@@ -36,11 +35,8 @@
   boot.initrd.luks.devices."luks-48836129-1aa0-45c7-9fd1-6b053fa620b1".device = "/dev/disk/by-uuid/48836129-1aa0-45c7-9fd1-6b053fa620b1";
   networking.hostName = "bert";
 
-  fileSystems."/mnt/bigbird-public" = {
-    device = "//bigbird/public";
-    fsType = "cifs";
-    options = [ "guest" ];
-  };
+  # Enable networking
+  networking.networkmanager.enable = true;
 
   time.timeZone = "America/Chicago";
   i18n.defaultLocale = "en_US.UTF-8";
diff --git a/bert/services/http/0hats.com.nix b/bert/services/http/0hats.com.nix
deleted file mode 100644
index 809af75..0000000
--- a/bert/services/http/0hats.com.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-
-{
-  services.caddy.virtualHosts."0hats.com" = {
-    serverAliases = ["www.0hats.com"];
-    extraConfig = ''
-      encode zstd gzip
-      file_server
-      root * /srv/www/0hats.com
-
-      handle_errors {
-        respond "{err.status_code} {err.status_text}"
-      }
-    '';
-  };
-  systemd.tmpfiles.settings."10-0hats-com" = {
-    "/srv/www/0hats.com" = {
-      d = {};
-    };
-  };
-}
diff --git a/bert/services/http/files.chandlerswift.com.nix b/bert/services/http/files.chandlerswift.com.nix
index 7aead1e..74c5e0c 100644
--- a/bert/services/http/files.chandlerswift.com.nix
+++ b/bert/services/http/files.chandlerswift.com.nix
@@ -4,10 +4,6 @@
     encode zstd gzip
     file_server
     root * /srv/www/files.chandlerswift.com
-
-    handle_errors {
-      respond "{err.status_code} {err.status_text}"
-    }
   '';
   systemd.tmpfiles.settings."10-files-chandlerswift-com" = {
     "/srv/www/files.chandlerswift.com" = {
diff --git a/bert/services/http/harborpaperco.com.nix b/bert/services/http/harborpaperco.com.nix
index 071f053..705b0b1 100644
--- a/bert/services/http/harborpaperco.com.nix
+++ b/bert/services/http/harborpaperco.com.nix
@@ -6,18 +6,14 @@
       encode zstd gzip
       file_server
       root * /srv/www/harborpaperco.com
-
-      handle_errors {
-        respond "{err.status_code} {err.status_text}"
-      }
-    '';
-  };
-  services.caddy.virtualHosts."pureserendipityweddings.com" = {
-    serverAliases = ["www.pureserendipityweddings.com"];
-    extraConfig = ''
-      redir https://harborpaperco.com
     '';
   };
+  # services.caddy.virtualHosts."pureserendipityweddings.com" = {
+  #   serverAliases = ["www.pureserendipityweddings.com"];
+  #   extraConfig = ''
+  #     redir https://harborpaperco.com
+  #   '';
+  # };
   systemd.tmpfiles.settings."10-harborpaperco-com" = {
     "/srv/www/harborpaperco.com" = {
       d = {};
diff --git a/bert/services/http/home.chandlerswift.com.nix b/bert/services/http/home.chandlerswift.com.nix
index 1c11558..eef8812 100644
--- a/bert/services/http/home.chandlerswift.com.nix
+++ b/bert/services/http/home.chandlerswift.com.nix
@@ -6,20 +6,6 @@
     root * /srv/www/home.chandlerswift.com
     reverse_proxy /grafana/* localhost:3000
     # hide .git # ???
-
-    file_server /sheets/* {
-      browse ${./caddy-browse-template.html}
-
-      # TOOD: is there a better way to strip the prefix here? This shouldn't be
-      # vulnerable to a directory traversal attack (and it doesn't really
-      # matter anyway; everything in there is public somewhere or another!) but
-      # it sorta feels wrong to do this without a `/sheets` suffix.
-      root /mnt/bigbird-public
-    }
-
-    handle_errors {
-      respond "{err.status_code} {err.status_text}"
-    }
   '';
   systemd.tmpfiles.settings."10-home-chandlerswift-com" = {
     "/srv/www/home.chandlerswift.com" = {
diff --git a/bert/services/http/index.nix b/bert/services/http/index.nix
index f85f0e7..4420666 100644
--- a/bert/services/http/index.nix
+++ b/bert/services/http/index.nix
@@ -1,13 +1,11 @@
 {
   imports = [
-    ./0hats.com.nix
     ./files.chandlerswift.com.nix
     ./git.chandlerswift.com.nix
     ./harborpaperco.com.nix
     ./home.chandlerswift.com.nix
     ./katherineandchandler.com.nix
     ./maps.chandlerswift.com.nix
-    ./music.chandlerswift.com.nix
     ./stjohnscccc.org.nix
     ./swiftgang.net.nix
   ];
diff --git a/bert/services/http/katherineandchandler.com.nix b/bert/services/http/katherineandchandler.com.nix
index 2aa308d..352cf32 100644
--- a/bert/services/http/katherineandchandler.com.nix
+++ b/bert/services/http/katherineandchandler.com.nix
@@ -5,10 +5,6 @@
     file_server
     root * /srv/www/katherineandchandler.com
     # hide .git # ???
-
-    handle_errors {
-      respond "{err.status_code} {err.status_text}"
-    }
   '';
   systemd.tmpfiles.settings."10-katherineandchandler-com" = {
     "/srv/www/katherineandchandler.com" = {
diff --git a/bert/services/http/maps.chandlerswift.com.nix b/bert/services/http/maps.chandlerswift.com.nix
index 101820b..fb21cb8 100644
--- a/bert/services/http/maps.chandlerswift.com.nix
+++ b/bert/services/http/maps.chandlerswift.com.nix
@@ -5,10 +5,6 @@
     file_server
     root * /srv/www/maps.chandlerswift.com
     # hide .git # ???
-
-    handle_errors {
-      respond "{err.status_code} {err.status_text}"
-    }
   '';
   systemd.tmpfiles.settings."10-maps-chandlerswift-com" = {
     "/srv/www/maps.chandlerswift.com" = {
diff --git a/bert/services/http/music.chandlerswift.com.nix b/bert/services/http/music.chandlerswift.com.nix
deleted file mode 100644
index c43cd35..0000000
--- a/bert/services/http/music.chandlerswift.com.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{config, ...}: {
-  services.caddy.virtualHosts."music.chandlerswift.com".extraConfig = ''
-    reverse_proxy localhost:${toString config.services.navidrome.settings.Port}
-  '';
-}
diff --git a/bert/services/http/swiftgang.net.nix b/bert/services/http/swiftgang.net.nix
index 1de094e..82bee79 100644
--- a/bert/services/http/swiftgang.net.nix
+++ b/bert/services/http/swiftgang.net.nix
@@ -4,10 +4,6 @@
     encode zstd gzip
     file_server
     root * /srv/www/swiftgang.net
-
-    handle_errors {
-      respond "{err.status_code} {err.status_text}"
-    }
   '';
   systemd.tmpfiles.settings."10-swiftgang-net" = {
     "/srv/www/swiftgang.net" = {
diff --git a/bert/services/navidrome.nix b/bert/services/navidrome.nix
deleted file mode 100644
index 42d86a6..0000000
--- a/bert/services/navidrome.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  services.navidrome = {
-    enable = true;
-    settings = {
-      MusicFolder = "/mnt/bigbird-public/media/music";
-      ScanSchedule = "@every 12h";
-      EnableSharing = true;
-    };
-  };
-}
diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index f34c211..10eea01 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -16,7 +16,6 @@
     "steam"
     "steam-original"
     "steam-run"
-    "steam-unwrapped"
   ];
 
   # https://discourse.nixos.org/t/github-strategies-for-configuration-nix/1983/14