diff --git a/channels.nix b/channels.nix
index f845a2ad..7320ace0 100644
--- a/channels.nix
+++ b/channels.nix
@@ -3,10 +3,10 @@ let
     nixpkgs-channel = "nixos-21.11";
     home-manager-channel = "home-manager-21.11";
   };
-  unstable = {
-    nixpkgs-channel = "nixos-unstable";
-    home-manager-channel = "home-manager-master";
-  };
+  #unstable = {
+  #  nixpkgs-channel = "nixos-unstable";
+  #  home-manager-channel = "home-manager-master";
+  #};
 in
 rec {
   hera = nixos-21-11;
diff --git a/common/common.nix b/common/common.nix
index 6f3a411e..c82eabe4 100644
--- a/common/common.nix
+++ b/common/common.nix
@@ -6,7 +6,6 @@
           path = "${path}/${name}";
           devices = hosts;
         };
-        rootFolder = path;
         devices = {
           apollo.id = "BOTTTGS-QQUHWAK-IFBT3T2-HGHHUZ7-QHRZXC7-JC42VT7-67ZOJBE-WHDWEQX";
           zeus.id = "5BUZIS5-ESTYAJO-IQQD7EA-O3VGONJ-E74OHUJ-ZSLF4JK-6HS3UHG-4CQ5OAO";
diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index c97927d9..432e3e8d 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -1,5 +1,4 @@
 let
-  inherit (import (import ../nix/sources.nix).nixos-unstable { }) lib;
   restrictedPages = [
     "reddit.com"
     "github.com"
diff --git a/nixos/machines/hera/configuration.nix b/nixos/machines/hera/configuration.nix
index bcbc675a..85ed565f 100644
--- a/nixos/machines/hera/configuration.nix
+++ b/nixos/machines/hera/configuration.nix
@@ -1,6 +1,5 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (config.m-0.private) me;
   inherit (import ../../../common/common.nix { inherit pkgs; }) syncthing;
   backupJobs = pkgs.privateValue { } "borgbackup";
   backupJobNames = map (name: "borgbackup-job-${name}") (lib.attrNames backupJobs);
diff --git a/nixos/roles/git.nix b/nixos/roles/git.nix
index e082b4de..c118c27a 100644
--- a/nixos/roles/git.nix
+++ b/nixos/roles/git.nix
@@ -1,13 +1,6 @@
 { config, pkgs, lib, ... }:
 let
   gitoliteCfg = config.services.gitolite;
-  me = config.m-0.private.me;
-  update-command = [
-    "${pkgs.systemd}/bin/systemctl"
-    "restart"
-    "test-config.service"
-    "--no-block"
-  ];
   post-update = pkgs.writeHaskellScript
     {
       name = "post-update";
diff --git a/nixos/roles/laminar/kassandra.nix b/nixos/roles/laminar/kassandra.nix
index c10954a1..16f53acf 100644
--- a/nixos/roles/laminar/kassandra.nix
+++ b/nixos/roles/laminar/kassandra.nix
@@ -6,7 +6,6 @@ let
     export PATH=${lib.makeBinPath path}:$PATH
   '';
   repo = "/var/www/fdroid";
-  appName = "de.maralorn.kassandra";
   deploy = "${pkgs.writeShellScript "deploy" ''
     systemctl restart kassandra
     cd /var/cache/gc-links/kassandra-android
diff --git a/nixos/roles/laminar/test-config.nix b/nixos/roles/laminar/test-config.nix
index 05a645cf..d331b07a 100644
--- a/nixos/roles/laminar/test-config.nix
+++ b/nixos/roles/laminar/test-config.nix
@@ -48,7 +48,6 @@ let
     git show -q
     REPODIR=.
   '';
-  remoteFlags = "--builders @/etc/nix/machines";
   systems = builtins.attrNames (builtins.readDir ../../machines);
   homes = lib.attrNames (import ../../../home-manager/machines.nix);
   mkHomeJob = (
diff --git a/nixos/roles/matrix-signal/default.nix b/nixos/roles/matrix-signal/default.nix
index 71b05b9e..825e1d12 100644
--- a/nixos/roles/matrix-signal/default.nix
+++ b/nixos/roles/matrix-signal/default.nix
@@ -1,8 +1,4 @@
 { pkgs, config, lib, ... }:
-let
-  synapse-port = 8008;
-
-in
 {
   imports = [
     ./mautrix-signal-module.nix
diff --git a/nixos/roles/standalone/default.nix b/nixos/roles/standalone/default.nix
index c3633071..16b6414f 100644
--- a/nixos/roles/standalone/default.nix
+++ b/nixos/roles/standalone/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: {
+{ pkgs, config, ... }: {
 
   boot = {
     plymouth.enable = true;
diff --git a/overlays/30-ghc/default.nix b/overlays/30-ghc/default.nix
index bbd055f6..5e302ff9 100644
--- a/overlays/30-ghc/default.nix
+++ b/overlays/30-ghc/default.nix
@@ -1,6 +1,5 @@
 final: prev:
 let
-  inherit (prev.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
   myPkgs = import ./packages.nix;
 in
 {
diff --git a/private b/private
index 6b928b7d..f89590a6 160000
--- a/private
+++ b/private
@@ -1 +1 @@
-Subproject commit 6b928b7d6554c7cdd2b912ca7e753fb4a3122ff0
+Subproject commit f89590a6fc8c75eb17dfbbfd17203b5a4e172bce