diff --git a/.github/duplicates-upstream-extra.txt b/.github/duplicates-upstream-extra.txt
index af09fa400..1c8365ed7 100644
--- a/.github/duplicates-upstream-extra.txt
+++ b/.github/duplicates-upstream-extra.txt
@@ -4,6 +4,4 @@ ocaml-system
 merlin
 merlin-dot-reader
 ocaml-lsp-server
-ocamlformat
 ocamlformat-rpc-lib
-odoc-parser
diff --git a/.github/duplicates-xs-toolstack.txt b/.github/duplicates-xs-toolstack.txt
index cf2ce5cdf..c74b103da 100644
--- a/.github/duplicates-xs-toolstack.txt
+++ b/.github/duplicates-xs-toolstack.txt
@@ -1,5 +1,3 @@
 ocaml
 ocaml-base-compiler
 ocaml-system
-ocamlformat
-odoc-parser
diff --git a/packages/ocaml/ocaml-system.4.14.1/files/gen_ocaml_config.ml.in b/packages/ocaml/ocaml-system.4.14.1/files/gen_ocaml_config.ml.in
index b8fa62b56..fdc510a6d 100644
--- a/packages/ocaml/ocaml-system.4.14.1/files/gen_ocaml_config.ml.in
+++ b/packages/ocaml/ocaml-system.4.14.1/files/gen_ocaml_config.ml.in
@@ -40,4 +40,4 @@ let () =
                      file-depends: [ [ %%S %%S ] [ %%S %%S ] ]\n\
                      variables { path: %%S }\n"
     ocamlc ocamlc_digest graphics graphics_digest (Filename.dirname ocamlc);
-  close_out oc
\ No newline at end of file
+  close_out oc
diff --git a/packages/upstream/ocamlformat.0.19.0/opam b/packages/upstream/ocamlformat.0.19.0/opam
deleted file mode 100644
index 906f7b0af..000000000
--- a/packages/upstream/ocamlformat.0.19.0/opam
+++ /dev/null
@@ -1,59 +0,0 @@
-opam-version: "2.0"
-name: "ocamlformat"
-version: "0.19.0"
-synopsis: "Auto-formatter for OCaml code"
-description:
-  "OCamlFormat is a tool to automatically format OCaml code in a uniform style."
-maintainer: "OCamlFormat Team <ocamlformat-dev@lists.ocaml.org>"
-authors: "Josh Berdine <jjb@fb.com>"
-license: "MIT AND LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-homepage: "https://github.com/ocaml-ppx/ocamlformat"
-bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues"
-depends: [
-  "dune" {>= "2.8"}
-  "dune" {with-test & < "3.0"}
-  "ocaml" {>= "4.08" & < "4.14"}
-  "alcotest" {with-test}
-  "base" {>= "v0.12.0"}
-  "base-unix"
-  "cmdliner"
-  "cmdliner" {with-test & < "1.1.0"}
-  "dune-build-info"
-  "fix"
-  "fpath"
-  "menhir" {>= "20201216"}
-  "menhirLib" {>= "20201216"}
-  "menhirSdk" {>= "20201216"}
-  "ocp-indent"
-  "bisect_ppx" {dev & >= "2.5.0"}
-  "odoc-parser" {>= "0.9.0" & < "1.0.0"}
-  "re" {>= "1.7.2"}
-  "stdio"
-  "uuseg" {>= "10.0.0"}
-  "uutf" {>= "1.0.1"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
-url {
-  src:
-    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.19.0/ocamlformat-0.19.0.tbz"
-  checksum: [
-    "sha256=62fc46aae8f0a4a33ce7f8d7726d7109bff615ea6fcb50d1482f21d20ee50f46"
-    "sha512=408b3af533169f201d7492be869f8ae4acde5583e01693c586929f44b76d569d3d6d555bc056378743d7cb3bd8e11ebc9cbd178ca196bcb82db33127d14902f8"
-  ]
-}
-x-commit-hash: "ba67af28ddca8718ef8816b2b0dc1e5b2f5e9591"
diff --git a/packages/upstream/odoc-parser.0.9.0/opam b/packages/upstream/odoc-parser.0.9.0/opam
deleted file mode 100644
index 5e42c35b7..000000000
--- a/packages/upstream/odoc-parser.0.9.0/opam
+++ /dev/null
@@ -1,36 +0,0 @@
-opam-version: "2.0"
-name: "odoc-parser"
-version: "0.9.0"
-synopsis: "Parser for ocaml documentation comments"
-description: """\
-Odoc_parser is a library for parsing the contents of OCaml documentation
-comments, formatted using 'odoc' syntax, an extension of the language
-understood by ocamldoc."""
-maintainer: "Jon Ludlam <jon@recoil.org>"
-authors: "Anton Bachin <antonbachin@yahoo.com>"
-license: "ISC"
-homepage: "https://github.com/ocaml-doc/odoc-parser"
-doc: "https://ocaml-doc.github.io/odoc-parser/"
-bug-reports: "https://github.com/ocaml-doc/odoc-parser/issues"
-depends: [
-  "dune" {>= "2.8"}
-  "ocaml" {>= "4.02.0" & < "5.0"}
-  "astring"
-  "result"
-  "ppx_expect" {with-test}
-  ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test})
-]
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs "@install" "@runtest" {with-test}]
-]
-dev-repo: "git+https://github.com/ocaml-doc/odoc-parser.git"
-url {
-  src:
-    "https://github.com/ocaml-doc/odoc-parser/releases/download/0.9.0/odoc-parser-0.9.0.tbz"
-  checksum: [
-    "sha256=df0dad1bad39bf4de6be666c4b63b973bd72eba3b75be9f726317121b5f0bd79"
-    "sha512=5222debc190784cee62fee177d39fcff56f326b1a3c5b4beb408d0c0eb3d43bf7dcfcffcd25ccc6c3d3c0c098771f01780cb687495ac2a4d95a4bc6401643316"
-  ]
-}
-x-commit-hash: "c5ce41b1e1841a2005bb3c4ca3bf1f77876d509d"