diff --git a/src/autorouter/autorouter.rs b/src/autorouter/autorouter.rs
index ff72a6f..eee07fe 100644
--- a/src/autorouter/autorouter.rs
+++ b/src/autorouter/autorouter.rs
@@ -6,7 +6,7 @@ use thiserror::Error;
 use crate::{
     board::{mesadata::AccessMesadata, Board},
     drawing::{
-        band::{BandTermsegIndex, BandUid},
+        band::BandTermsegIndex,
         dot::FixedDotIndex,
         Infringement,
     },
diff --git a/src/autorouter/measure_length.rs b/src/autorouter/measure_length.rs
index da53d44..ed76ff5 100644
--- a/src/autorouter/measure_length.rs
+++ b/src/autorouter/measure_length.rs
@@ -1,6 +1,6 @@
 use crate::{
     board::mesadata::AccessMesadata,
-    drawing::{band::BandUid, graph::PrimitiveIndex},
+    drawing::graph::PrimitiveIndex,
     geometry::{primitive::PrimitiveShape, shape::MeasureLength as MeasureLengthTrait},
     graph::MakeRef,
     router::{navmesh::Navmesh, trace::Trace},
diff --git a/src/autorouter/selection.rs b/src/autorouter/selection.rs
index 2a32b06..815bc6f 100644
--- a/src/autorouter/selection.rs
+++ b/src/autorouter/selection.rs
@@ -4,10 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     board::{mesadata::AccessMesadata, BandName, Board},
-    drawing::{
-        band::BandUid,
-        graph::{GetLayer, MakePrimitive, PrimitiveIndex},
-    },
+    drawing::graph::{GetLayer, MakePrimitive, PrimitiveIndex},
     geometry::{compound::ManageCompounds, GenericNode},
     graph::{GenericIndex, GetPetgraphIndex},
     layout::{poly::PolyWeight, CompoundWeight, NodeIndex},
diff --git a/src/board/board.rs b/src/board/board.rs
index 6671638..56d7aa5 100644
--- a/src/board/board.rs
+++ b/src/board/board.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     board::mesadata::AccessMesadata,
     drawing::{
-        band::{BandTermsegIndex, BandUid},
+        band::BandUid,
         dot::{FixedDotIndex, FixedDotWeight},
         graph::{GetLayer, GetMaybeNet},
         seg::{FixedSegIndex, FixedSegWeight},
diff --git a/src/drawing/drawing.rs b/src/drawing/drawing.rs
index 8644c9d..68d6889 100644
--- a/src/drawing/drawing.rs
+++ b/src/drawing/drawing.rs
@@ -21,7 +21,7 @@ use crate::{
         cane::Cane,
         collect::Collect,
         dot::{DotIndex, DotWeight, FixedDotIndex, FixedDotWeight, LooseDotIndex, LooseDotWeight},
-        gear::{GearIndex, GearRef, GetNextGear},
+        gear::{GearIndex, GetNextGear},
         graph::{GetLayer, GetMaybeNet, MakePrimitive, PrimitiveIndex, PrimitiveWeight},
         guide::Guide,
         loose::{GetPrevNextLoose, Loose, LooseIndex},
@@ -38,8 +38,6 @@ use crate::{
     graph::MakeRef,
 };
 
-use super::head::{Head, HeadRef};
-
 #[enum_dispatch]
 #[derive(Error, Debug, Clone, Copy)]
 pub enum DrawingException {
diff --git a/src/drawing/primitive.rs b/src/drawing/primitive.rs
index 25c7a1d..51b697d 100644
--- a/src/drawing/primitive.rs
+++ b/src/drawing/primitive.rs
@@ -1,10 +1,6 @@
 use enum_dispatch::enum_dispatch;
 use petgraph::stable_graph::NodeIndex;
 
-use crate::geometry::{
-    primitive::{AccessPrimitiveShape, PrimitiveShape},
-    GetOffset, GetWidth,
-};
 use crate::{
     drawing::{
         bend::{BendIndex, FixedBendWeight, LooseBendIndex, LooseBendWeight},
@@ -14,7 +10,7 @@ use crate::{
         seg::{FixedSegWeight, LoneLooseSegWeight, SegIndex, SeqLooseSegIndex, SeqLooseSegWeight},
         Drawing,
     },
-    geometry::GenericNode,
+    geometry::{primitive::PrimitiveShape, GenericNode, GetOffset, GetWidth},
     graph::{GenericIndex, GetPetgraphIndex},
 };
 
diff --git a/src/layout/layout.rs b/src/layout/layout.rs
index 8520770..c68dd65 100644
--- a/src/layout/layout.rs
+++ b/src/layout/layout.rs
@@ -11,7 +11,6 @@ use crate::{
         dot::{DotIndex, FixedDotIndex, FixedDotWeight, LooseDotIndex, LooseDotWeight},
         gear::GearIndex,
         graph::{GetMaybeNet, PrimitiveIndex},
-        primitive::{GetJoints, GetOtherJoint},
         rules::AccessRules,
         seg::{
             FixedSegIndex, FixedSegWeight, LoneLooseSegIndex, LoneLooseSegWeight, SeqLooseSegIndex,
@@ -19,7 +18,7 @@ use crate::{
         },
         Drawing, DrawingException, Infringement,
     },
-    geometry::{compound::ManageCompounds, shape::MeasureLength, GenericNode},
+    geometry::{compound::ManageCompounds, GenericNode},
     graph::{GenericIndex, GetPetgraphIndex},
     layout::{
         poly::{Poly, PolyWeight},
diff --git a/src/layout/poly.rs b/src/layout/poly.rs
index 5b5125a..657d1c3 100644
--- a/src/layout/poly.rs
+++ b/src/layout/poly.rs
@@ -5,7 +5,7 @@ use geo::{LineString, Point, Polygon};
 use crate::{
     drawing::{
         dot::FixedDotIndex,
-        graph::{GetLayer, GetMaybeNet, MakePrimitive, PrimitiveIndex},
+        graph::{GetLayer, GetMaybeNet, PrimitiveIndex},
         primitive::GetLimbs,
         rules::AccessRules,
         seg::SegIndex,