diff --git a/Cargo.toml b/Cargo.toml
index b662aea..f5fc5a2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,6 @@ log = "^0.4"
 base64 = "^0.11"
 
 # Optional dependencies
-async-trait = { version = "0.1", optional = true }
 rustyline = { version = "6.0", optional = true }
 dirs-next = { version = "2.0", optional = true }
 env_logger = { version = "0.7", optional = true }
@@ -29,10 +28,11 @@ regex = {version = "1", optional = true }
 
 [features]
 default = []
-repl = ["async-trait", "bdk/key-value-db", "clap", "dirs-next", "env_logger", "regex", "rustyline"]
+repl = ["bdk/key-value-db", "clap", "dirs-next", "env_logger", "regex", "rustyline"]
 electrum = ["bdk/electrum"]
 esplora = ["bdk/esplora"]
 compiler = ["bdk/compiler"]
+async-interface = ["bdk/async-interface"]
 
 [[bin]]
 name = "bdk-cli"
diff --git a/src/lib.rs b/src/lib.rs
index 2f76126..c114501 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -97,15 +97,13 @@
 pub extern crate bdk;
 #[macro_use]
 extern crate serde_json;
-#[cfg(any(target_arch = "wasm32", feature = "async-interface"))]
-#[macro_use]
-extern crate async_trait;
 #[macro_use]
 extern crate bdk_macros;
 
 use std::collections::BTreeMap;
 use std::str::FromStr;
 
+pub use structopt;
 use structopt::StructOpt;
 
 use crate::OfflineWalletSubCommand::*;
@@ -582,7 +580,6 @@ fn parse_outpoint(s: &str) -> Result<OutPoint, String> {
 /// Execute an offline wallet sub-command
 ///
 /// Offline wallet sub-commands are described in [`OfflineWalletSubCommand`].
-#[maybe_async]
 pub fn handle_offline_wallet_subcommand<T, D>(
     wallet: &Wallet<T, D>,
     offline_subcommand: OfflineWalletSubCommand,