diff --git a/Cargo.lock b/Cargo.lock
index e56e9b65..8b805403 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -467,12 +467,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -571,19 +565,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version 0.4.0",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -616,7 +597,6 @@ dependencies = [
  "config",
  "console-subscriber",
  "d7sneakers",
- "derive_more",
  "dtn7-codegen",
  "dtn7-plus",
  "enum_dispatch",
@@ -655,7 +635,7 @@ dependencies = [
 
 [[package]]
 name = "dtn7-codegen"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "lazy_static",
  "quote",
@@ -1755,16 +1735,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.22",
+ "semver",
 ]
 
 [[package]]
@@ -1825,12 +1796,6 @@ dependencies = [
  "semver-parser",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-
 [[package]]
 name = "semver-parser"
 version = "0.7.0"
@@ -2002,7 +1967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
 dependencies = [
  "discard",
- "rustc_version 0.2.3",
+ "rustc_version",
  "serde",
  "serde_json",
  "stdweb-derive",
diff --git a/core/codegen/Cargo.toml b/core/codegen/Cargo.toml
index cd6a0e19..fd395d2e 100644
--- a/core/codegen/Cargo.toml
+++ b/core/codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dtn7-codegen"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 authors = ["Lars Baumgaertner <baumgaertner@cs.tu-darmstadt.de>"]
 description = "codegen helpers for dtn7-rs"
diff --git a/core/codegen/src/cla.rs b/core/codegen/src/cla.rs
index 8d2fd798..a1fc17fe 100644
--- a/core/codegen/src/cla.rs
+++ b/core/codegen/src/cla.rs
@@ -37,17 +37,27 @@ pub fn init_cla_subsystem(_item: TokenStream) -> TokenStream {
 
     let cla_enum = quote! {
         #[enum_dispatch]
-        #[derive(Debug, Display)]
+        #[derive(Debug)]
         pub enum CLAEnum {
             #(#cla_subsystem),*
         }
+        impl std::fmt::Display for CLAEnum {
+            fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(f, "{:?}", self)
+            }
+        }
     };
 
     let clas_available = quote! {
-        #[derive(Debug, Display, PartialEq, Eq, Hash, Clone, Copy, Serialize, Deserialize)]
+        #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy, Serialize, Deserialize)]
         pub enum CLAsAvailable {
             #(#cla_subsystem),*
         }
+        impl std::fmt::Display for CLAsAvailable {
+            fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(f, "{:?}", self)
+            }
+        }
         impl From<CLAsAvailable> for &'static str {
             fn from(v: CLAsAvailable) -> Self {
                 match v {
diff --git a/core/dtn7/Cargo.toml b/core/dtn7/Cargo.toml
index 602d7d17..3b14f24e 100644
--- a/core/dtn7/Cargo.toml
+++ b/core/dtn7/Cargo.toml
@@ -62,7 +62,6 @@ tempfile = "3.5.0"
 humansize = "2.1.2"
 sled = "0.34.7"
 enum_dispatch = "0.3.8"
-derive_more = "0.99.17"
 axum = { version = "0.5.13", features = ["ws"] }
 http = "0.2.7"
 #tower = "0.4.8"
@@ -73,8 +72,8 @@ bitflags = "2.0.2"
 num-derive = "0.4.2"
 num-traits = "0.2.15"
 thiserror = "1.0.31"
-dtn7-codegen = { path = "../codegen", version = "0.1.1" }
-reqwest = { version = "0.11.13", default-features = false, features = ["json"] }
+dtn7-codegen = { path = "../codegen", version = "0.1.2" }
+reqwest = { version = "0.11.13", default-features = false}
 sha1 = "0.10.5"
 glob-match = "0.2.1"
 
diff --git a/core/dtn7/src/cla/mod.rs b/core/dtn7/src/cla/mod.rs
index a749665d..e9fbc8e3 100644
--- a/core/dtn7/src/cla/mod.rs
+++ b/core/dtn7/src/cla/mod.rs
@@ -10,7 +10,6 @@ use self::http::HttpConvergenceLayer;
 use anyhow::Result;
 use async_trait::async_trait;
 use bp7::{ByteBuffer, EndpointID};
-use derive_more::*;
 use dtn7_codegen::init_cla_subsystem;
 use dummy::DummyConvergenceLayer;
 use enum_dispatch::enum_dispatch;
diff --git a/core/dtn7/src/routing/mod.rs b/core/dtn7/src/routing/mod.rs
index bd49330c..585f6091 100644
--- a/core/dtn7/src/routing/mod.rs
+++ b/core/dtn7/src/routing/mod.rs
@@ -12,7 +12,6 @@ use crate::BundleID;
 use async_trait::async_trait;
 use bp7::Bundle;
 use bp7::EndpointID;
-use derive_more::*;
 use enum_dispatch::enum_dispatch;
 use epidemic::EpidemicRoutingAgent;
 use external::ExternalRoutingAgent;
@@ -35,7 +34,7 @@ pub enum RoutingNotifcation {
 }
 
 #[enum_dispatch]
-#[derive(Debug, Display)]
+#[derive(Debug)]
 pub enum RoutingAgentsEnum {
     EpidemicRoutingAgent,
     FloodingRoutingAgent,
@@ -45,6 +44,12 @@ pub enum RoutingAgentsEnum {
     StaticRoutingAgent,
 }
 
+impl Display for RoutingAgentsEnum {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
+
 pub enum RoutingCmd {
     SenderForBundle(BundlePack, oneshot::Sender<(Vec<ClaSenderTask>, bool)>),
     Notify(RoutingNotifcation),