diff --git a/src/rust/amadeus-rs/Cargo.lock b/src/rust/amadeus-rs/Cargo.lock
index dbf3c1923497294c560885781ebc59fa9cc3e650..25f8651df2a9485136e29cf28054c8cbe4666cd5 100644
--- a/src/rust/amadeus-rs/Cargo.lock
+++ b/src/rust/amadeus-rs/Cargo.lock
@@ -639,15 +639,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "fastrand"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "flate2"
 version = "1.0.24"
@@ -979,7 +970,6 @@ dependencies = [
  "amadeus_macro",
  "lazy_static",
  "log",
- "no-panic",
  "regex",
  "serde",
  "serde_json",
@@ -1184,16 +1174,6 @@ dependencies = [
  "memoffset",
 ]
 
-[[package]]
-name = "no-panic"
-version = "0.1.15"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "tempfile",
-]
-
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
@@ -1451,15 +1431,6 @@ version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "ron"
 version = "0.7.1"
@@ -1659,20 +1630,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.34"
diff --git a/src/rust/amadeus-rs/Cargo.toml b/src/rust/amadeus-rs/Cargo.toml
index f3ba4ed4f9e99abc508c057c42da17ac6027ff60..d4b65efa9e001d0b3427dfd8a6b49501d7966504 100644
--- a/src/rust/amadeus-rs/Cargo.toml
+++ b/src/rust/amadeus-rs/Cargo.toml
@@ -1,9 +1,9 @@
 [workspace]
+resolver = "2"
 members = [
     "amadeus",
     "amadeus-lib",
     "amadeus-macro",
     "lkt-rs",
-    "lkt-lib",
-    "no-panic"
+    "lkt-lib"
 ]
diff --git a/src/rust/amadeus-rs/amadeus/Cargo.toml b/src/rust/amadeus-rs/amadeus/Cargo.toml
index a0e68ae14e671a6726551c252ea1df131837f221..e60c07ea07810f86b22699518c5dc6fe437ed2e3 100644
--- a/src/rust/amadeus-rs/amadeus/Cargo.toml
+++ b/src/rust/amadeus-rs/amadeus/Cargo.toml
@@ -8,11 +8,11 @@ license = "MIT"
 lkt_lib       = { path = "../lkt-lib" }
 amadeus_lib   = { path = "../amadeus-lib" }
 amadeus_macro = { path = "../amadeus-macro" }
-serde         = { version = "1", default-features = false,     features = [ "derive", "std" ] }
-serde_json    = { version = "1", default-features = false,     features = [ "std" ] }
-eframe        = { version = "0",                               features = [ "persistence" ] }
-image         = { version = "^0.24", default-features = false, features = [ "jpeg", "ico", "png" ] }
-egui          = { version = "0",                               features = [ "extra_debug_asserts", "extra_asserts", "serde", "persistence" ] }
-epi           = { version = "0",                               features = [ "persistence" ] }
+serde         = { version = "1", default-features = false,    features = [ "derive", "std" ] }
+serde_json    = { version = "1", default-features = false,    features = [ "std" ] }
+image         = { version = "0.24", default-features = false, features = [ "jpeg", "ico", "png" ] }
+eframe        = { version = "0",                              features = [ "persistence" ] }
+egui          = { version = "0",                              features = [ "extra_debug_asserts", "extra_asserts", "serde", "persistence" ] }
+epi           = { version = "0",                              features = [ "persistence" ] }
 log           = { version = "0.4" }
-lazy_static   = "1"
\ No newline at end of file
+lazy_static   = "1"
diff --git a/src/rust/amadeus-rs/lkt-lib/Cargo.toml b/src/rust/amadeus-rs/lkt-lib/Cargo.toml
index 3c5214492cb00977ade570dc0786d566eade8144..d28a58181390b0bbe7207150be48431dfcef0619 100644
--- a/src/rust/amadeus-rs/lkt-lib/Cargo.toml
+++ b/src/rust/amadeus-rs/lkt-lib/Cargo.toml
@@ -6,7 +6,6 @@ license = "MIT"
 
 [dependencies]
 amadeus_macro   = { path = "../amadeus-macro" }
-no-panic        = { path = "../no-panic" }
 serde           = { version = "1", default-features = false, features = [ "derive", "std" ] }
 serde_json      = { version = "1", default-features = false, features = [ "std" ] }
 log             = { version = "0.4" }
diff --git a/src/rust/amadeus-rs/no-panic b/src/rust/amadeus-rs/no-panic
deleted file mode 160000
index 32558fbd00c01981c64e4742724342a9c5f0203b..0000000000000000000000000000000000000000
--- a/src/rust/amadeus-rs/no-panic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 32558fbd00c01981c64e4742724342a9c5f0203b