diff --git a/data-model/src/entry.rs b/data-model/src/entry.rs
index 7137e3e..55af509 100644
--- a/data-model/src/entry.rs
+++ b/data-model/src/entry.rs
@@ -1,7 +1,5 @@
 #[cfg(feature = "dev")]
-use arbitrary::size_hint::and_all;
-#[cfg(feature = "dev")]
-use arbitrary::Arbitrary;
+use arbitrary::{size_hint::and_all, Arbitrary};
 
 use crate::{
     encoding::{DecodeError, U64BE},
diff --git a/data-model/src/grouping/area.rs b/data-model/src/grouping/area.rs
index f99e3ca..c300f9f 100644
--- a/data-model/src/grouping/area.rs
+++ b/data-model/src/grouping/area.rs
@@ -1,3 +1,4 @@
+#[cfg(feature = "dev")]
 use arbitrary::{size_hint::and_all, Arbitrary};
 
 use crate::{
diff --git a/data-model/src/grouping/range.rs b/data-model/src/grouping/range.rs
index ffc3872..5fdb6f1 100644
--- a/data-model/src/grouping/range.rs
+++ b/data-model/src/grouping/range.rs
@@ -1,6 +1,7 @@
 use core::cmp;
 use core::cmp::Ordering;
 
+#[cfg(feature = "dev")]
 use arbitrary::{Arbitrary, Error as ArbitraryError};
 
 use crate::path::Path;
diff --git a/data-model/src/grouping/range_3d.rs b/data-model/src/grouping/range_3d.rs
index d77c59c..9927f1a 100644
--- a/data-model/src/grouping/range_3d.rs
+++ b/data-model/src/grouping/range_3d.rs
@@ -1,3 +1,4 @@
+#[cfg(feature = "dev")]
 use arbitrary::Arbitrary;
 
 use crate::{