diff --git a/Makefile b/Makefile
index d6099331c60..7d0677277fa 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,7 @@ DUNE_IU_PACKAGES1+=message-switch message-switch-cli message-switch-core message
 DUNE_IU_PACKAGES1+=message-switch-unix xapi-idl xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli
 DUNE_IU_PACKAGES1+=xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix
 DUNE_IU_PACKAGES1+=xapi-rrd xapi-inventory clock xapi-sdk
-DUNE_IU_PACKAGES1+=xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-tools
+DUNE_IU_PACKAGES1+=xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-tools
 
 
 install-dune1:
diff --git a/dune-project b/dune-project
index 2d8cab13744..a3d6651fc45 100644
--- a/dune-project
+++ b/dune-project
@@ -669,16 +669,6 @@ This package provides an Lwt compatible interface to the library.")
   (name xapi-inventory)
 )
 
-(package
-  (name xapi-stdext-date)
-  (synopsis "Xapi's standard library extension, Dates")
-  (authors "Jonathan Ludlam")
-  (depends
-    (clock (= :version))
-    ptime
-  )
-)
-
 (package
   (name xapi-stdext-encodings)
   (synopsis "Xapi's standard library extension, Encodings")
diff --git a/ocaml/libs/resources/test/dune b/ocaml/libs/resources/test/dune
index 2bc052f2e63..15a20f0bfa3 100644
--- a/ocaml/libs/resources/test/dune
+++ b/ocaml/libs/resources/test/dune
@@ -4,6 +4,7 @@
   (action (run %{test} -e))
   (libraries
     safe-resources
+    logs
     logs.fmt
     alcotest
   )
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/date.ml b/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/date.ml
deleted file mode 100644
index ef0f98ce13a..00000000000
--- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/date.ml
+++ /dev/null
@@ -1,35 +0,0 @@
-(*
- * Copyright (C) 2006-2009 Citrix Systems Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 only. with the special
- * exception on linking described in file LICENSE.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *)
-
-include Clock.Date
-
-let never = epoch
-
-let of_string = of_iso8601
-
-let to_string = to_rfc3339
-
-let of_float = of_unix_time
-
-let to_float = to_unix_time
-
-let rfc822_of_float = of_unix_time
-
-let rfc822_to_string = to_rfc822
-
-let eq = equal
-
-type iso8601 = t
-
-type rfc822 = t
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/date.mli b/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/date.mli
deleted file mode 100644
index 9af45ab6096..00000000000
--- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/date.mli
+++ /dev/null
@@ -1,115 +0,0 @@
-(*
- * Copyright (C) 2006-2009 Citrix Systems Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 only. with the special
- * exception on linking described in file LICENSE.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *)
-
-(** date-time with support for keeping timezone for ISO 8601 conversion *)
-type t = Clock.Date.t
-
-(** Conversions *)
-
-val of_ptime : Ptime.t -> t
-(** Convert ptime to time in UTC *)
-
-val to_ptime : t -> Ptime.t
-(** Convert date/time to a ptime value: the number of seconds since 00:00:00
-    UTC, 1 Jan 1970. Assumes the underlying {!t} is in UTC *)
-
-val of_unix_time : float -> t
-(** Convert calendar time [x] (as returned by e.g. Unix.time), to time in UTC *)
-
-val to_unix_time : t -> float
-(** Convert date/time to a unix timestamp: the number of seconds since
-    00:00:00 UTC, 1 Jan 1970. Assumes the underlying {!t} is in UTC *)
-
-val to_rfc822 : t -> string
-(** Convert date/time to email-formatted (RFC 822) string. *)
-
-val to_rfc3339 : t -> string
-(** Convert date/time to an RFC-3339-formatted string. It also complies with
-    the ISO 8601 format *)
-
-val of_iso8601 : string -> t
-(** Convert ISO 8601 formatted string to a date/time value. Does not accept a
-    timezone annotated datetime - i.e. string must be UTC, and end with a Z *)
-
-val epoch : t
-(** 00:00:00 UTC, 1 Jan 1970, in UTC *)
-
-val now : unit -> t
-(** Count the number of seconds passed since 00:00:00 UTC, 1 Jan 1970, in UTC *)
-
-val _localtime_string : Ptime.tz_offset_s option -> Ptime.t -> string
-(** exposed for testing *)
-
-val localtime : unit -> t
-(** Count the number of seconds passed since 00:00:00 UTC, 1 Jan 1970, in local
-    time *)
-
-(** Comparisons *)
-
-val equal : t -> t -> bool
-(** [equal a b] returns whether [a] and [b] are equal *)
-
-val compare : t -> t -> int
-(** [compare a b] returns -1 if [a] is earlier than [b], 1 if [a] is later than
-    [b] or the ordering of the timezone printer *)
-
-val is_earlier : than:t -> t -> bool
-(** [is_earlier ~than a] returns whether the timestamp [a] happens before
-    [than] *)
-
-val is_later : than:t -> t -> bool
-(** [is_later ~than a] returns whether the timestamp [a] happens after [than]
-    *)
-
-val diff : t -> t -> Ptime.Span.t
-(** [diff a b] returns the span of time corresponding to [a - b] *)
-
-(** Deprecated bindings, these will be removed in a future release: *)
-
-val eq : t -> t -> bool
-[@@deprecated "Use Date.equal"]
-(** [eq a b] returns whether [a] and [b] are equal *)
-
-val rfc822_to_string : t -> string
-[@@deprecated "Use Date.to_rfc822"]
-(** Same as {!to_rfc822} *)
-
-val rfc822_of_float : float -> t
-[@@deprecated "Use Date.of_unix_time"]
-(** Same as {!of_unix_time} *)
-
-val of_float : float -> t
-[@@deprecated "Use Date.of_unix_time"]
-(** Same as {!of_unix_time} *)
-
-val to_float : t -> float
-[@@deprecated "Use Date.to_unix_time"]
-(** Same as {!to_unix_time} *)
-
-val to_string : t -> string
-[@@deprecated "Use Date.to_rfc3339"]
-(** Same as {!to_rfc3339} *)
-
-val of_string : string -> t
-[@@deprecated "Use Date.of_iso8601"]
-(** Same as {!of_iso8601} *)
-
-val never : t [@@deprecated "Use Date.epoch"]
-(** Same as {!epoch} *)
-
-(** Deprecated alias for {!t} *)
-type iso8601 = t [@@deprecated "Use Date.t"]
-
-(** Deprecated alias for {!t} *)
-type rfc822 = t [@@deprecated "Use Date.t"]
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/dune b/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/dune
deleted file mode 100644
index 8566d86e12c..00000000000
--- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-date/dune
+++ /dev/null
@@ -1,6 +0,0 @@
-(library
-  (name xapi_stdext_date)
-  (public_name xapi-stdext-date)
-  (modules :standard)
-  (libraries clock ptime)
-)
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.ml b/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.ml
index 7293ae625e1..45bbd93622c 100644
--- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.ml
+++ b/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.ml
@@ -19,6 +19,8 @@ type 'a t = {default: 'a event; mutable size: int; mutable data: 'a event array}
 
 exception EmptyHeap
 
+exception OutOfBounds of int
+
 let create n default =
   if n <= 0 then
     invalid_arg "create"
@@ -61,7 +63,7 @@ let maximum h =
 let remove h s =
   if h.size <= 0 then raise EmptyHeap ;
   if s < 0 || s >= h.size then
-    invalid_arg (Printf.sprintf "%s: index %d out of bounds" __FUNCTION__ s) ;
+    raise (OutOfBounds s) ;
   let n = h.size - 1 in
   let d = h.data in
   let x = d.(n) in
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.mli b/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.mli
index 19f8bf1e33f..b542ef9d65d 100644
--- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.mli
+++ b/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.mli
@@ -18,6 +18,8 @@ type 'a t
 
 exception EmptyHeap
 
+exception OutOfBounds of int
+
 val create : int -> 'a -> 'a t
 (** [create n default] creates an empty Imperative priority queue.
    The queue initially is initialized to store [n] elements.
diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq_test.ml b/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq_test.ml
index a9cc2611da8..aab499da74a 100644
--- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq_test.ml
+++ b/ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq_test.ml
@@ -18,14 +18,9 @@ module Ipq = Xapi_stdext_threads_scheduler.Ipq
 let test_out_of_index () =
   let q = Ipq.create 10 0 in
   Ipq.add q {Ipq.ev= 123; Ipq.time= Mtime_clock.elapsed ()} ;
-  let is_oob = function
-    | Invalid_argument s when String.ends_with ~suffix:"  out of bounds" s ->
-        true
-    | _ ->
-        false
-  in
   let oob_check n =
-    (Alcotest.match_raises "out of bound" is_oob @@ fun () -> Ipq.remove q n) ;
+    let oob = Ipq.OutOfBounds n in
+    (Alcotest.check_raises "out of bound" oob @@ fun () -> Ipq.remove q n) ;
     Alcotest.(check bool) "same value" false (Ipq.is_empty q)
   in
   oob_check 10 ;
diff --git a/xapi-stdext-date.opam b/xapi-stdext-date.opam
deleted file mode 100644
index 06021447900..00000000000
--- a/xapi-stdext-date.opam
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-synopsis: "Xapi's standard library extension, Dates"
-maintainer: ["Xapi project maintainers"]
-authors: ["Jonathan Ludlam"]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-homepage: "https://xapi-project.github.io/"
-bug-reports: "https://github.com/xapi-project/xen-api/issues"
-depends: [
-  "dune" {>= "3.15"}
-  "clock" {= version}
-  "ptime"
-  "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/xapi-project/xen-api.git"