diff --git a/packages/carton-git.0.5.0~dev/opam b/packages/carton-git.0.5.0~dev/opam
deleted file mode 100644
index 2b29350..0000000
--- a/packages/carton-git.0.5.0~dev/opam
+++ /dev/null
@@ -1,42 +0,0 @@
-opam-version: "2.0"
-name: "carton-git"
-synopsis: "Implementation of PACK file in OCaml"
-description: """\
-Carton is an implementation of the PACK file
-in OCaml. PACK file is used by Git to store Git objects. Carton is more
-abstracted when it can store any objects."""
-maintainer: "Romain Calascibetta <romain.calascibetta@gmail.com>"
-authors: "Romain Calascibetta <romain.calascibetta@gmail.com>"
-license: "MIT"
-homepage: "https://github.com/mirage/ocaml-git"
-doc: "https://mirage.github.io/ocaml-git/"
-bug-reports: "https://github.com/mirage/ocaml-git/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.8.0"}
-  "carton" {= version}
-  "carton-lwt" {= version}
-  "bigstringaf" {>= "0.9.0"}
-  "lwt"
-  "fpath"
-  "result"
-  "fmt" {>= "0.8.9"}
-  "base-unix"
-  "decompress" {>= "1.4.3"}
-  "astring" {>= "0.8.5"}
-  "alcotest" {>= "1.2.3" & with-test}
-  "alcotest-lwt" {>= "1.2.3" & with-test}
-  "cstruct" {>= "6.1.0" & with-test}
-  "logs" {>= "0.7.0"}
-  "mirage-flow" {>= "2.0.1" & with-test}
-  "rresult" {>= "0.6.0" & with-test}
-  "ke" {>= "0.6" & with-test}
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-dev-repo: "git+https://github.com/mirage/ocaml-git.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-git.git#re-add-time"
-}
diff --git a/packages/carton-lwt.0.5.0~dev/opam b/packages/carton-lwt.0.5.0~dev/opam
deleted file mode 100644
index 65d9088..0000000
--- a/packages/carton-lwt.0.5.0~dev/opam
+++ /dev/null
@@ -1,44 +0,0 @@
-opam-version: "2.0"
-name: "carton-lwt"
-synopsis: "Implementation of PACK file in OCaml"
-description: """\
-Carton is an implementation of the PACK file
-in OCaml. PACK file is used by Git to store Git objects. Carton is more
-abstracted when it can store any objects."""
-maintainer: "Romain Calascibetta <romain.calascibetta@gmail.com>"
-authors: "Romain Calascibetta <romain.calascibetta@gmail.com>"
-license: "MIT"
-homepage: "https://github.com/mirage/ocaml-git"
-doc: "https://mirage.github.io/ocaml-git/"
-bug-reports: "https://github.com/mirage/ocaml-git/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.8.0"}
-  "carton" {= version}
-  "lwt"
-  "decompress" {>= "1.4.3"}
-  "optint" {>= "0.0.4"}
-  "bigstringaf" {>= "0.9.0"}
-  "alcotest" {>= "1.2.3" & with-test}
-  "alcotest-lwt" {>= "1.2.3" & with-test}
-  "cstruct" {>= "6.1.0" & with-test}
-  "fmt" {>= "0.8.9" & with-test}
-  "logs" {>= "0.7.0" & with-test}
-  "mirage-flow" {>= "2.0.1" & with-test}
-  "result" {>= "1.5" & with-test}
-  "rresult" {>= "0.6.0" & with-test}
-  "ke" {>= "0.6" & with-test}
-  "base64" {>= "3.4.0" & with-test}
-  "bos" {>= "0.2.0" & with-test}
-  "checkseum" {>= "0.3.3" & with-test}
-  "digestif" {>= "1.1.2" & with-test}
-  "fpath" {>= "0.7.3" & with-test}
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-dev-repo: "git+https://github.com/mirage/ocaml-git.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-git.git#re-add-time"
-}
diff --git a/packages/carton.0.5.0~dev/opam b/packages/carton.0.5.0~dev/opam
deleted file mode 100644
index 21196ce..0000000
--- a/packages/carton.0.5.0~dev/opam
+++ /dev/null
@@ -1,51 +0,0 @@
-opam-version: "2.0"
-name: "carton"
-synopsis: "Implementation of PACKv2 file in OCaml"
-description: """\
-Carton is an implementation of the PACKv2 file
-in OCaml. PACKv2 file is used by Git to store Git objects.
-Carton is more abstracted when it can store any objects."""
-maintainer: "Romain Calascibetta <romain.calascibetta@gmail.com>"
-authors: "Romain Calascibetta <romain.calascibetta@gmail.com>"
-license: "MIT"
-homepage: "https://github.com/mirage/ocaml-git"
-doc: "https://mirage.github.io/ocaml-git/"
-bug-reports: "https://github.com/mirage/ocaml-git/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.8.0"}
-  "ke" {>= "0.6"}
-  "duff" {>= "0.5"}
-  "decompress" {>= "1.4.3"}
-  "cstruct" {>= "6.1.0"}
-  "optint" {>= "0.0.4"}
-  "bigstringaf" {>= "0.9.0"}
-  "checkseum" {>= "0.3.3"}
-  "logs"
-  "cmdliner" {>= "1.1.0"}
-  "hxd" {>= "0.3.2"}
-  "psq" {>= "0.2.0"}
-  "fmt" {>= "0.8.9"}
-  "result"
-  "rresult"
-  "fpath"
-  "base64" {with-test & >= "3.0.0"}
-  "bos"
-  "digestif" {>= "1.1.2"}
-  "base-unix" {with-test}
-  "base-threads" {with-test}
-  "alcotest" {with-test}
-  "crowbar" {with-test & >= "0.2.1"}
-  "alcotest-lwt" {>= "1.2.3" & with-test}
-  "lwt" {>= "5.3.0" & with-test}
-  "ocamlfind" {>= "1.8.1" & with-test}
-  "mirage-flow" {>= "2.0.1" & with-test}
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-dev-repo: "git+https://github.com/mirage/ocaml-git.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-git.git#re-add-time"
-}
diff --git a/packages/git-mirage.3.10.0~dev/opam b/packages/git-mirage.3.10.0~dev/opam
deleted file mode 100644
index 85b05bc..0000000
--- a/packages/git-mirage.3.10.0~dev/opam
+++ /dev/null
@@ -1,57 +0,0 @@
-opam-version: "2.0"
-synopsis: "A package to use ocaml-git with MirageOS backend"
-maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
-authors: "Thomas Gazagnaire"
-license: "ISC"
-homepage: "https://github.com/mirage/ocaml-git"
-doc: "https://mirage.github.io/ocaml-git/"
-bug-reports: "https://github.com/mirage/ocaml-git/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.8.0"}
-  "mimic"
-  "mimic-happy-eyeballs" {>= "0.0.5"}
-  "base64" {>= "3.5.0"}
-  "git" {= version}
-  "git-paf" {= version}
-  "awa" {>= "0.1.0"}
-  "awa-mirage" {>= "0.1.0"}
-  "dns" {>= "6.1.3"}
-  "dns-client" {>= "6.1.3"}
-  "tls"
-  "tls-mirage"
-  "uri"
-  "hex"
-  "happy-eyeballs-mirage" {>= "0.1.2"}
-  "happy-eyeballs" {>= "0.1.2"}
-  "ca-certs-nss"
-  "mirage-crypto"
-  "ptime"
-  "x509"
-  "cstruct"
-  "tcpip" {>= "7.0.0"}
-  "domain-name" {>= "0.3.0"}
-  "fmt" {>= "0.8.9"}
-  "ipaddr" {>= "5.0.1"}
-  "lwt" {>= "5.3.0"}
-  "mirage-clock" {>= "3.1.0"}
-  "mirage-flow" {>= "2.0.1"}
-  "mirage-random" {>= "2.0.0"}
-  "mirage-time" {>= "2.0.1"}
-  "result" {>= "1.5"}
-  "rresult" {>= "0.6.0"}
-  "alcotest" {>= "1.2.3" & with-test}
-  "alcotest-lwt" {>= "1.2.3" & with-test}
-  "bigstringaf" {>= "0.9.0" & with-test}
-  "cstruct" {>= "6.0.0" & with-test}
-  "logs" {>= "0.7.0" & with-test}
-  "ke" {>= "0.4" & with-test}
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test}
-]
-dev-repo: "git+https://github.com/mirage/ocaml-git.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-git.git#re-add-time"
-}
diff --git a/packages/git-paf.3.10.0~dev/opam b/packages/git-paf.3.10.0~dev/opam
deleted file mode 100644
index 74a5675..0000000
--- a/packages/git-paf.3.10.0~dev/opam
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-synopsis: "A package to use HTTP-based ocaml-git with MirageOS backend"
-maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
-authors: "Thomas Gazagnaire"
-license: "ISC"
-homepage: "https://github.com/mirage/ocaml-git"
-doc: "https://mirage.github.io/ocaml-git/"
-bug-reports: "https://github.com/mirage/ocaml-git/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.8.0"}
-  "git" {= version}
-  "mimic" {>= "0.0.4"}
-  "paf" {>= "0.0.7"}
-  "ca-certs-nss"
-  "fmt"
-  "ipaddr"
-  "logs"
-  "lwt"
-  "mirage-clock"
-  "tcpip" {>= "7.0.0"}
-  "mirage-time"
-  "result"
-  "rresult"
-  "tls" {>= "0.14.0"}
-  "uri"
-  "bigstringaf"
-  "domain-name"
-  "httpaf"
-  "mirage-flow"
-  "tls-mirage"
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test}
-]
-dev-repo: "git+https://github.com/mirage/ocaml-git.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-git.git#re-add-time"
-}
diff --git a/packages/git-unix.3.10.0~dev/opam b/packages/git-unix.3.10.0~dev/opam
deleted file mode 100644
index 5e32ec0..0000000
--- a/packages/git-unix.3.10.0~dev/opam
+++ /dev/null
@@ -1,60 +0,0 @@
-opam-version: "2.0"
-synopsis: "Virtual package to install and configure ocaml-git's Unix backend"
-maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
-authors: "Thomas Gazagnaire"
-license: "ISC"
-homepage: "https://github.com/mirage/ocaml-git"
-doc: "https://mirage.github.io/ocaml-git/"
-bug-reports: "https://github.com/mirage/ocaml-git/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.8.0"}
-  "git" {= version}
-  "git-mirage" {= version}
-  "happy-eyeballs-lwt" {>= "0.1.2"}
-  "rresult"
-  "result"
-  "bigstringaf" {>= "0.9.0"}
-  "fmt" {>= "0.8.7"}
-  "bos"
-  "fpath"
-  "uri" {with-test}
-  "digestif" {>= "1.1.2"}
-  "logs"
-  "lwt" {>= "5.6.0"}
-  "base-unix"
-  "alcotest" {with-test & >= "1.1.0"}
-  "alcotest-lwt" {with-test & >= "1.1.0"}
-  "base64" {with-test & >= "3.0.0"}
-  "mirage-clock" {>= "4.1.0"}
-  "mirage-clock-unix" {>= "4.1.0"}
-  "astring" {>= "0.8.5"}
-  "awa" {>= "0.1.0"}
-  "mirage-time" {>= "2.0.0"}
-  "mirage-unix" {>= "5.0.0"}
-  "cmdliner" {>= "1.1.0"}
-  "decompress" {>= "1.4.0"}
-  "domain-name" {>= "0.3.0"}
-  "ipaddr" {>= "5.0.1"}
-  "mtime" {>= "1.2.0"}
-  "ocamlfind" {>= "1.8.1"}
-  "tcpip" {>= "7.0.0"}
-  "cstruct" {>= "6.0.0"}
-  "awa-mirage" {>= "0.1.0"}
-  "mirage-flow" {>= "2.0.1"}
-  "ke" {>= "0.4" & with-test}
-  "mirage-crypto-rng" {>= "0.8.8" & with-test}
-  "ptime"
-  "mimic"
-  "ca-certs-nss" {>= "3.60"}
-  "tls" {>= "0.14.0"}
-  "tls-mirage" {>= "0.14.0"}
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test}
-]
-dev-repo: "git+https://github.com/mirage/ocaml-git.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-git.git#re-add-time"
-}
diff --git a/packages/git.3.10.0~dev/opam b/packages/git.3.10.0~dev/opam
deleted file mode 100644
index a42e41a..0000000
--- a/packages/git.3.10.0~dev/opam
+++ /dev/null
@@ -1,64 +0,0 @@
-opam-version: "2.0"
-synopsis: "Git format and protocol in pure OCaml"
-description: """\
-Support for on-disk and in-memory Git stores. Can read and write all
-the Git objects: the usual blobs, trees, commits and tags but also
-the pack files, pack indexes and the index file (where the staging area
-lives).
-
-All the objects share a consistent API, and convenience functions are
-provided to manipulate the different objects."""
-maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
-authors: "Thomas Gazagnaire"
-license: "ISC"
-homepage: "https://github.com/mirage/ocaml-git"
-doc: "https://mirage.github.io/ocaml-git/"
-bug-reports: "https://github.com/mirage/ocaml-git/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.8.0"}
-  "digestif" {>= "1.1.2"}
-  "rresult"
-  "base64" {>= "3.0.0"}
-  "result"
-  "bigstringaf" {>= "0.9.0"}
-  "optint"
-  "decompress" {>= "1.4.0"}
-  "logs"
-  "lwt"
-  "mimic" {>= "0.0.4"}
-  "cstruct" {>= "6.0.0"}
-  "angstrom" {>= "0.14.0"}
-  "carton" {>= "0.4.4"}
-  "carton-lwt" {>= "0.4.4"}
-  "carton-git" {>= "0.4.4"}
-  "ke" {>= "0.4"}
-  "fmt" {>= "0.8.7"}
-  "checkseum" {>= "0.3.3"}
-  "ocamlgraph" {>= "1.8.8"}
-  "astring"
-  "fpath"
-  "encore" {>= "0.8"}
-  "alcotest" {with-test & >= "1.1.0"}
-  "alcotest-lwt" {with-test & >= "1.1.0"}
-  "mirage-crypto-rng" {with-test & >= "0.8.0"}
-  "cmdliner" {with-test & >= "1.1.0"}
-  "base-unix" {with-test}
-  "fpath"
-  "hxd" {>= "0.3.2"}
-  "mirage-flow" {>= "2.0.1"}
-  "domain-name" {>= "0.3.0"}
-  "emile" {>= "1.1"}
-  "ipaddr" {>= "5.0.1"}
-  "psq" {>= "0.2.0"}
-  "uri" {>= "4.1.0"}
-  "crowbar" {>= "0.2.1" & with-test}
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name] {with-test}
-]
-dev-repo: "git+https://github.com/mirage/ocaml-git.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-git.git#re-add-time"
-}
diff --git a/packages/tar-mirage.2.1.99~dev/opam b/packages/tar-mirage.2.1.99~dev/opam
deleted file mode 100644
index 1fbefd3..0000000
--- a/packages/tar-mirage.2.1.99~dev/opam
+++ /dev/null
@@ -1,50 +0,0 @@
-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-synopsis: "Read and write tar format files via MirageOS interfaces"
-description: """
-tar is a simple library to read and write tar files with an emphasis on
-streaming.  This library is functorised over external OS dependencies
-to facilitate embedding within MirageOS.
-"""
-maintainer: ["dave@recoil.org"]
-authors: ["Dave Scott" "Thomas Gazagnaire" "David Allsopp" "Antonin Décimo"]
-license: "ISC"
-tags: ["org:xapi-project" "org:mirage"]
-homepage: "https://github.com/mirage/ocaml-tar"
-doc: "https://mirage.github.io/ocaml-tar/"
-bug-reports: "https://github.com/mirage/ocaml-tar/issues"
-depends: [
-  "dune" {>= "2.9"}
-  "ocaml" {>= "4.08.0"}
-  "cstruct" {>= "1.9.0"}
-  "lwt" {>= "5.6.0"}
-  "mirage-block" {>= "2.0.0"}
-  "mirage-kv" {>= "5.0.0"}
-  "ptime"
-  "tar" {= version}
-  "mirage-block-unix" {with-test & >= "2.5.0"}
-  "ounit2" {with-test}
-  "ounit2-lwt" {with-test}
-  "tar-unix" {with-test & = version}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "--promote-install-files=false"
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-  ["dune" "install" "-p" name "--create-install-files" name]
-]
-dev-repo: "git+https://github.com/mirage/ocaml-tar.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-tar.git#kv-rw-kv-5"
-}
diff --git a/packages/tar.2.1.99~dev/opam b/packages/tar.2.1.99~dev/opam
deleted file mode 100644
index 26a3684..0000000
--- a/packages/tar.2.1.99~dev/opam
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-synopsis: "Decode and encode tar format files in pure OCaml"
-description: """
-tar is a simple library to read and write tar files with an emphasis on
-streaming.
-
-This is pure OCaml code, no C bindings.
-"""
-maintainer: ["dave@recoil.org"]
-authors: ["Dave Scott" "Thomas Gazagnaire" "David Allsopp" "Antonin Décimo"]
-license: "ISC"
-tags: ["org:xapi-project" "org:mirage"]
-homepage: "https://github.com/mirage/ocaml-tar"
-doc: "https://mirage.github.io/ocaml-tar/"
-bug-reports: "https://github.com/mirage/ocaml-tar/issues"
-depends: [
-  "dune" {>= "2.9"}
-  "camlp-streams"
-  "ocaml" {>= "4.08.0"}
-  "ppx_cstruct" {build & >= "3.6.0"}
-  "cstruct" {>= "6.0.0"}
-  "decompress" {>= "1.5.1"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "--promote-install-files=false"
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-  ["dune" "install" "-p" name "--create-install-files" name]
-]
-dev-repo: "git+https://github.com/mirage/ocaml-tar.git"
-url {
-  src: "git+https://github.com/hannesm/ocaml-tar.git#kv-rw-kv-5"
-}