diff --git a/common-sw.nix b/common-sw.nix
index 01a7a7a..c5f733f 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -5,7 +5,6 @@
     gitg
     gmpc
     m4
-    subversion
     openjdk8
     sbt scala
     chromium
@@ -21,16 +20,13 @@
     cmake ninja
     mpv
     neomutt notmuch
-    goldendict
     patchelf
-    bazaar
-    tokei loc
+    loc
     ripgrep
     imagemagick
     mercurial
 
     alacritty
-    neovim-qt
 
     androidenv.platformTools # adb & fastboot
 
@@ -40,18 +36,12 @@
 
     pdfpc
 
-    # haskell dev
-    cabal2nix
-    cabal-install
-    # ghc-mod
-
     # emacs
     emacs
-    emacsPackages.cask
     ghostscript # for auctex
     aspell
 
-    nodejs-8_x
+    nodejs-9_x
 
     mediainfo
 
@@ -75,8 +65,6 @@
     # toysolver
 
     emacsPackages.proofgeneral
-
-    stablePkgs # protect nixpkgs checkout from GC
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
   nixpkgs.config.packageOverrides = pkgs: with pkgs; let
@@ -117,8 +105,6 @@
 
     stablePkgs = stablePkgs;
     stable = import stablePkgs {};
-
-    qutebrowser = pkgs.qutebrowser.override { withWebEngineDefault = true; };
   };
 
   nixpkgs.config.allowTexliveBuilds = true;
diff --git a/large-sw.nix b/large-sw.nix
index 6707bf3..4f22c5a 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -10,6 +10,7 @@
     jabref
     libreoffice-fresh
     calibre
+    goldendict
 
     qutebrowser