diff --git a/embassy/demos/common/common.rs b/embassy/demos/common/common.rs
index 482eb77ee1e839be7c69d603090424d58be3a0ba..a74f2128f6889bcc1a22c2646a4242739bd0794a 100644
--- a/embassy/demos/common/common.rs
+++ b/embassy/demos/common/common.rs
@@ -1,30 +1,23 @@
-#![feature(type_alias_impl_trait)]
-
 #[allow(unused_imports)]
 #[cfg(not(feature = "defmt"))]
 use {
     log::{debug, error, info, log, trace, warn},
 };
 
+#[allow(unused)]
 #[cfg(feature = "defmt")]
 use defmt::{debug, info, warn, panic, error, trace};
 
-use core::future::Future;
-
-use embassy_executor::{Spawner, Executor};
 use embassy_sync::mutex::Mutex;
 use embassy_sync::blocking_mutex::raw::{NoopRawMutex, CriticalSectionRawMutex};
 use embassy_sync::signal::Signal;
 use embassy_net::tcp::TcpSocket;
-use embassy_net::{Stack, Device, StackResources, ConfigStrategy};
+use embassy_net::{Stack, Device};
 use embassy_futures::join::join;
-use static_cell::StaticCell;
 
 use menu::Runner as MenuRunner;
-use menu::Menu;
 
 use sunset::*;
-use sunset::error::TrapBug;
 use sunset_embassy::SSHServer;
 
 mod demo_menu;
@@ -153,7 +146,7 @@ impl DemoShell {
                     menu.context.flush(serv, chan).await?;
                 }
             }
-            Ok(())
+            // Ok(())
         };
 
         session.await
diff --git a/embassy/demos/picow/src/main.rs b/embassy/demos/picow/src/main.rs
index e13f1bc11eea06c80aecfdf141049a18ca8ce953..e109c355a35f2ccf6c2956ae11e68ae6562a2db7 100644
--- a/embassy/demos/picow/src/main.rs
+++ b/embassy/demos/picow/src/main.rs
@@ -2,21 +2,11 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-use core::future::Future;
-
-use core::todo;
 use defmt::*;
 use embassy_executor::Spawner;
-use embassy_sync::mutex::Mutex;
-use embassy_sync::blocking_mutex::raw::{NoopRawMutex, CriticalSectionRawMutex};
-use embassy_sync::signal::Signal;
-use embassy_net::tcp::TcpSocket;
 use embassy_net::{Stack, StackResources};
 use embassy_rp::gpio::{Flex, Level, Output};
-use embassy_futures::join::join;
-use embassy_rp::peripherals::{PIN_23, PIN_24, PIN_25, PIN_29};
-use embedded_hal_async::spi::{ExclusiveDevice, SpiBusFlush, SpiBusRead, SpiBusWrite};
-use embedded_io::asynch::{Read, Write};
+use embedded_hal_async::spi::ExclusiveDevice;
 use static_cell::StaticCell;
 use {defmt_rtt as _, panic_probe as _};
 
@@ -24,7 +14,6 @@ use rand::rngs::OsRng;
 use rand::RngCore;
 
 use sunset::*;
-use sunset_embassy::SSHServer;
 
 mod wifi;
 #[path = "../../common/common.rs"]
diff --git a/embassy/demos/picow/src/wifi.rs b/embassy/demos/picow/src/wifi.rs
index e34f24ea3d17ede3fa0210c14561a9397fde7cf0..393f2798374f2b1e252cb61f6669e1f1b1ad3250 100644
--- a/embassy/demos/picow/src/wifi.rs
+++ b/embassy/demos/picow/src/wifi.rs
@@ -1,4 +1,4 @@
-use embassy_rp::gpio::{Flex, Level, Output};
+use embassy_rp::gpio::{Flex, Output};
 use embassy_rp::peripherals::{PIN_23, PIN_24, PIN_25, PIN_29};
 use embedded_hal_async::spi::{ExclusiveDevice, SpiBusFlush, SpiBusRead, SpiBusWrite};
 use embedded_hal_1::spi::ErrorType;
diff --git a/embassy/demos/std/src/main.rs b/embassy/demos/std/src/main.rs
index 5f5d75a84d77e7d44fb92236cf8fc614ce2fe958..5246a6b96dd25b85e9aaa45cd7df43d2fc94c374 100644
--- a/embassy/demos/std/src/main.rs
+++ b/embassy/demos/std/src/main.rs
@@ -5,26 +5,13 @@ use {
     log::{debug, error, info, log, trace, warn},
 };
 
-use core::future::Future;
-
-use core::todo;
 use embassy_executor::{Spawner, Executor};
-use embassy_sync::mutex::Mutex;
-use embassy_sync::blocking_mutex::raw::{NoopRawMutex, CriticalSectionRawMutex};
-use embassy_sync::signal::Signal;
-use embassy_net::tcp::TcpSocket;
 use embassy_net::{Stack, StackResources, ConfigStrategy};
-use embassy_futures::join::join;
-use embedded_io::asynch::{Read, Write};
 use static_cell::StaticCell;
 
 use rand::rngs::OsRng;
 use rand::RngCore;
 
-use sunset::*;
-use sunset::error::TrapBug;
-use sunset_embassy::SSHServer;
-
 use crate::tuntap::TunTapDevice;
 
 mod tuntap;
diff --git a/embassy/src/embassy_sunset.rs b/embassy/src/embassy_sunset.rs
index fb6635b2a787d1e3409791ac0d33f1ef5084f428..afd20d3f6f4ad2975e07b3a36a012911ea1dcb0a 100644
--- a/embassy/src/embassy_sunset.rs
+++ b/embassy/src/embassy_sunset.rs
@@ -15,7 +15,7 @@ use embassy_net::tcp::TcpSocket;
 
 use pin_utils::pin_mut;
 
-use sunset::{Runner, Result, Error, Behaviour, ServBehaviour, CliBehaviour};
+use sunset::{Runner, Result, Error, Behaviour};
 use sunset::config::MAX_CHANNELS;
 
 pub(crate) struct Inner<'a> {
diff --git a/embassy/src/server.rs b/embassy/src/server.rs
index b02f2d2855b6a12ea2ce4712d8ba445b8b37e70c..8bb05c3405df36d32b7d8979e04def1a7bbdf12b 100644
--- a/embassy/src/server.rs
+++ b/embassy/src/server.rs
@@ -1,5 +1,5 @@
 use embassy_sync::mutex::Mutex;
-use embassy_sync::blocking_mutex::raw::{NoopRawMutex, RawMutex};
+use embassy_sync::blocking_mutex::raw::RawMutex;
 use embassy_net::tcp::TcpSocket;
 
 use sunset::*;