diff --git a/.nix/config.nix b/.nix/config.nix
index 4ca9c7d9b..3bf64abf8 100644
--- a/.nix/config.nix
+++ b/.nix/config.nix
@@ -1,6 +1,5 @@
 let common-bundles = {
   hierarchy-builder.override.version = "master";
-  hierarchy-builder-shim.job = false;
   mathcomp.override.version = "master";
   odd-order.override.version = "master";
   mathcomp-analysis.override.version = "master";
diff --git a/.nix/coq-overlays/coq-elpi/default.nix b/.nix/coq-overlays/coq-elpi/default.nix
deleted file mode 100644
index 3cc12b156..000000000
--- a/.nix/coq-overlays/coq-elpi/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib, mkCoqDerivation, which, coq, version ? null }:
-
-with builtins; with lib; let
-  elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [
-    { case = "8.11"; out = { version = "1.11.4"; };}
-    { case = "8.12"; out = { version = "1.12.0"; };}
-    { case = "8.13"; out = { version = "1.13.7"; };}
-    { case = "8.14"; out = { version = "1.13.7"; };}
-    { case = "8.15"; out = { version = "1.15.0"; };}
-    { case = "8.16"; out = { version = "1.17.0"; };}
-    { case = "8.17"; out = { version = "1.17.0"; };}
-    { case = "8.18"; out = { version = "v1.18.1"; };}
-    { case = "8.19"; out = { version = "v1.18.2"; };}
-  ] {} );
-in mkCoqDerivation {
-  pname = "elpi";
-  repo  = "coq-elpi";
-  owner = "LPCIC";
-  inherit version;
-  defaultVersion = lib.switch coq.coq-version [
-    { case = "8.18"; out = "1.19.0"; }
-    { case = "8.17"; out = "1.18.0"; }
-    { case = "8.16"; out = "1.15.6"; }
-    { case = "8.15"; out = "1.14.0"; }
-    { case = "8.14"; out = "1.11.2"; }
-    { case = "8.13"; out = "1.11.1"; }
-    { case = "8.12"; out = "1.8.3_8.12"; }
-    { case = "8.11"; out = "1.6.3_8.11"; }
-  ] null;
-  release."1.19.0".sha256     = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ=";
-  release."1.18.0".sha256     = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y=";
-  release."1.17.0".sha256     = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM=";
-  release."1.15.6".sha256     = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno=";
-  release."1.15.1".sha256     = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg=";
-  release."1.14.0".sha256     = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp";
-  release."1.13.0".sha256     = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n";
-  release."1.12.1".sha256     = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY=";
-  release."1.11.2".sha256     = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4";
-  release."1.11.1".sha256     = "10j076vc2hdcbm15m6s7b6xdzibgfcbzlkgjnlkr2vv9k13qf8kc";
-  release."1.10.1".sha256     = "1zsyx26dvj7pznfd2msl2w7zbw51q1nsdw0bdvdha6dga7ijf7xk";
-  release."1.9.7".sha256      = "0rvn12h9dpk9s4pxy32p8j0a1h7ib7kg98iv1cbrdg25y5vs85n1";
-  release."1.9.5".sha256      = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6";
-  release."1.9.4".sha256      = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
-  release."1.9.3".sha256      = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
-  release."1.9.2".sha256      = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07";
-  release."1.8.3_8.12".sha256  = "15z2l4zy0qpw0ws7bvsmpmyv543aqghrfnl48nlwzn9q0v89p557";
-  release."1.8.3_8.12".version = "1.8.3";
-  release."1.8.2_8.12".sha256  = "1n6jwcdazvjgj8vsv2r9zgwpw5yqr5a1ndc2pwhmhqfl04b5dk4y";
-  release."1.8.2_8.12".version = "1.8.2";
-  release."1.8.1".sha256      = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
-  release."1.8.0".sha256      = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1";
-  release."1.7.0".sha256      = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8";
-  release."1.6.3_8.11".sha256 = "1j340cr2bv95clzzkkfmsjkklham1mj84cmiyprzwv20q89zr1hp";
-  release."1.6.3_8.11".version = "1.6.3";
-  release."1.6.2_8.11".sha256 = "06xrx0ljilwp63ik2sxxr7h617dgbch042xfcnfpy5x96br147rn";
-  release."1.6.2_8.11".version = "1.6.2";
-  release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53";
-  release."1.6.1_8.11".version = "1.6.1";
-  release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq";
-  release."1.6.0_8.11".version = "1.6.0";
-  release."1.6.0".sha256      = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
-  releaseRev = v: "v${v}";
-
-  mlPlugin = true;
-  useDune = true;
-  propagatedBuildInputs = [ coq.ocamlPackages.findlib elpi coq.ocamlPackages.ppx_optcomp ];
-
-  meta = {
-    description = "Coq plugin embedding ELPI.";
-    maintainers = [ maintainers.cohencyril ];
-    license = licenses.lgpl21Plus;
-  };
-}
diff --git a/.nix/coq-overlays/hierarchy-builder/default.nix b/.nix/coq-overlays/hierarchy-builder/default.nix
deleted file mode 100644
index 080e077f3..000000000
--- a/.nix/coq-overlays/hierarchy-builder/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, mkCoqDerivation, which, coq, coq-elpi,
-  version ? null, shim ? false }:
-
-with lib; mkCoqDerivation {
-  pname = "hierarchy-builder" + optionalString shim "-shim";
-  owner = "math-comp";
-  inherit version;
-  defaultVersion = with versions; switch coq.coq-version [
-    { case = range "8.13" "8.14"; out = "1.2.0"; }
-    { case = range "8.12" "8.13"; out = "1.1.0"; }
-    { case = isEq "8.11";         out = "0.10.0"; }
-  ] null;
-  release."1.2.0".sha256  = "0sk01rvvk652d86aibc8rik2m8iz7jn6mw9hh6xkbxlsvh50719d";
-  release."1.1.0".sha256  = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q=";
-  release."1.0.0".sha256  = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp";
-  release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
-  releaseRev = v: "v${v}";
-
-  nativeBuildInputs = [ which ];
-
-  propagatedBuildInputs = [ coq-elpi ];
-
-  mlPlugin = true;
-
-  buildPhase = "make build" + optionalString shim " -C shim";
-
-  installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ]
-    ++ optional shim "-C shim";
-
-  meta = {
-    description = "High level commands to declare a hierarchy based on packed classes";
-    maintainers = with maintainers; [ cohencyril siraben ];
-    license = licenses.mit;
-  };
-}