diff --git a/Cargo.lock b/Cargo.lock
index 074221793..4becde6fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2210,7 +2210,6 @@ dependencies = [
  "chrono",
  "clap",
  "dirs",
- "fabro-macros",
  "fabro-model",
  "fabro-util",
  "hex",
diff --git a/lib/crates/fabro-config/src/layers/server.rs b/lib/crates/fabro-config/src/layers/server.rs
index 96a4538d0..8b4d30e02 100644
--- a/lib/crates/fabro-config/src/layers/server.rs
+++ b/lib/crates/fabro-config/src/layers/server.rs
@@ -3,7 +3,7 @@
 use fabro_types::settings::server::{
     GithubIntegrationStrategy, ObjectStoreProvider, ServerAuthMethod, WebhookStrategy,
 };
-use fabro_types::settings::{Duration as DurationLayer, InterpString};
+use fabro_types::settings::{Duration, InterpString};
 use serde::{Deserialize, Serialize};
 
 use super::maps::StickyMap;
@@ -139,7 +139,7 @@ pub struct ServerSlateDbLayer {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub prefix:         Option<InterpString>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub flush_interval: Option<DurationLayer>,
+    pub flush_interval: Option<Duration>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub local:          Option<ObjectStoreLocalLayer>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
diff --git a/lib/crates/fabro-types/Cargo.toml b/lib/crates/fabro-types/Cargo.toml
index 07b75903c..67d2fbcdb 100644
--- a/lib/crates/fabro-types/Cargo.toml
+++ b/lib/crates/fabro-types/Cargo.toml
@@ -21,7 +21,6 @@ workspace = true
 chrono = { workspace = true, features = ["serde"] }
 clap = { workspace = true, optional = true }
 dirs.workspace = true
-fabro-macros = { path = "../fabro-macros" }
 fabro-model = { path = "../fabro-model" }
 fabro-util = { path = "../fabro-util" }
 hex.workspace = true
diff --git a/lib/crates/fabro-types/src/settings/server.rs b/lib/crates/fabro-types/src/settings/server.rs
index 410a02dd6..a80937d78 100644
--- a/lib/crates/fabro-types/src/settings/server.rs
+++ b/lib/crates/fabro-types/src/settings/server.rs
@@ -13,7 +13,7 @@ use ipnet::IpNet;
 use serde::de::Error as _;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-use super::duration::Duration as DurationLayer;
+use super::duration::Duration;
 use super::interp::InterpString;
 
 /// A structurally resolved `[server]` view for consumers.
@@ -295,14 +295,14 @@ fn serialize_std_duration<S>(value: &StdDuration, serializer: S) -> Result<S::Ok
 where
     S: Serializer,
 {
-    serializer.serialize_str(&DurationLayer::from_std(*value).to_string())
+    serializer.serialize_str(&Duration::from_std(*value).to_string())
 }
 
 fn deserialize_std_duration<'de, D>(deserializer: D) -> Result<StdDuration, D::Error>
 where
     D: Deserializer<'de>,
 {
-    Ok(DurationLayer::deserialize(deserializer)?.as_std())
+    Ok(Duration::deserialize(deserializer)?.as_std())
 }
 
 /// Closed enum of object-store providers. Unknown providers hard-fail