diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index b671c1f6fa4d..b90033e438db 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Run graphical applications with Docker";
     homepage = "https://github.com/mviereck/x11docker";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ jD91mZM2 ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index de8ae12b8952..12f487f1784c 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -102,8 +102,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   #### PANEL PLUGINS
 
-  xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
-
   xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
 
   xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
deleted file mode 100644
index e35dc5922d93..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
-stdenv.mkDerivation rec {
-  pname = "vala-panel-appmenu-xfce";
-  version = "0.6.94";
-
-  src = "${fetchFromGitHub {
-    owner = "rilian-la-te";
-    repo = "vala-panel-appmenu";
-    rev = version;
-    fetchSubmodules = true;
-
-    sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
-  }}/subprojects/appmenu-gtk-module";
-
-  nativeBuildInputs = [ cmake vala ];
-  buildInputs = [ glib gtk2 gtk3 ];
-
-  configurePhase = ''
-    cmake . -DGTK3_INCLUDE_GDK=
-  '';
-  installPhase = ''
-    make DESTDIR=output install
-    cp -r output/var/empty/* "$out"
-  '';
-
-  meta = with lib; {
-    description = "Port of the Unity GTK Module";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ jD91mZM2 ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
deleted file mode 100644
index d8946c98a385..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkg-config, cmake, vala, libxml2,
-  glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
-  xfce, libwnck3, libdbusmenu, gobject-introspection }:
-
-stdenv.mkDerivation rec {
-  pname = "xfce4-vala-panel-appmenu-plugin";
-  version = "0.7.3";
-
-  src = fetchFromGitHub {
-    owner = "rilian-la-te";
-    repo = "vala-panel-appmenu";
-    rev = version;
-    fetchSubmodules = true;
-
-    sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw";
-  };
-
-  nativeBuildInputs = [ pkg-config cmake vala libxml2.bin ];
-  buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
-                  glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
-                  at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
-                  libwnck3 libdbusmenu gobject-introspection ];
-
-  patches = [
-    (substituteAll {
-      src = ./fix-bamf-dependency.patch;
-      bamf = bamf;
-    })
-  ];
-
-  cmakeFlags = [
-      "-DENABLE_XFCE=ON"
-      "-DENABLE_BUDGIE=OFF"
-      "-DENABLE_VALAPANEL=OFF"
-      "-DENABLE_MATE=OFF"
-      "-DENABLE_JAYATANA=OFF"
-      "-DENABLE_APPMENU_GTK_MODULE=OFF"
-  ];
-
-  preConfigure = ''
-    mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake
-  '';
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.gitLister src.meta.homepage;
-  };
-
-  meta = with lib; {
-    description = "Global Menu applet for XFCE4";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ jD91mZM2 ];
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
deleted file mode 100644
index 1ed86a67f727..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-+++ source/cmake/FindBAMF.cmake	2018-05-11 17:03:44.385917811 +0200
-@@ -80,9 +80,7 @@
- 
- find_program(BAMF_DAEMON_EXECUTABLE
- 	bamfdaemon
--	HINTS ${CMAKE_INSTALL_FULL_LIBDIR}
--		  ${CMAKE_INSTALL_FULL_LIBEXECDIR}
--		  ${BAMF_LIBDIR}
-+	HINTS "@bamf@/libexec/bamf/"
- 	PATH_SUFFIXES bamf
- )
- 
diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix
index 2449769e07f3..4b5540c699cf 100644
--- a/pkgs/development/tools/scaff/default.nix
+++ b/pkgs/development/tools/scaff/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Painless and powerful scaffolding of projects";
     license = licenses.mit;
-    maintainers = with maintainers; [ jD91mZM2 ];
+    maintainers = with lib.maintainers; [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index b92344bf9c4b..022111e4b314 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     description = "NX X server based on Xnest";
     homepage = "https://github.com/ArcticaProject/nx-libs";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ jD91mZM2 ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 677c2b73b649..1349ce993411 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -618,6 +618,7 @@ mapAliases ({
   saneBackendsGit = sane-backends-git; # added 2016-01-02
   saneFrontends = sane-frontends; # added 2016-01-02
   sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now";
+  scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01
   scim = sc-im; # added 2016-01-22
   scollector = bosun; # added 2018-04-25
   sdlmame = mame; # added 2019-10-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffe533aef6b1..4c8698a1701f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12860,8 +12860,6 @@ in
 
   sauce-connect = callPackage ../development/tools/sauce-connect { };
 
-  scaff = callPackage ../development/tools/scaff { };
-
   sd-local = callPackage ../development/tools/sd-local { };
 
   selenium-server-standalone = callPackage ../development/tools/selenium/server { };