diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
index 1fe1ed98..b90f059d 100644
--- a/bdk-ffi/src/bdk.udl
+++ b/bdk-ffi/src/bdk.udl
@@ -100,7 +100,7 @@ interface Wallet {
 
   Balance get_balance();
 
-  boolean is_mine(Script script);
+  boolean is_mine([ByRef] Script script);
 
   [Throws=BdkError]
   void apply_update(Update update);
@@ -118,7 +118,7 @@ interface Update {};
 interface TxBuilder {
   constructor();
 
-  TxBuilder add_recipient(Script script, u64 amount);
+  TxBuilder add_recipient([ByRef] Script script, u64 amount);
 
   TxBuilder set_recipients(sequence<ScriptAmount> recipients);
 
@@ -142,7 +142,7 @@ interface TxBuilder {
 
   TxBuilder drain_wallet();
 
-  TxBuilder drain_to(Script script);
+  TxBuilder drain_to([ByRef] Script script);
 
   TxBuilder enable_rbf();
 
@@ -187,16 +187,16 @@ interface DerivationPath {
 };
 
 interface DescriptorSecretKey {
-  constructor(Network network, Mnemonic mnemonic, string? password);
+  constructor(Network network, [ByRef] Mnemonic mnemonic, string? password);
 
   [Name=from_string, Throws=BdkError]
   constructor(string secret_key);
 
   [Throws=BdkError]
-  DescriptorSecretKey derive(DerivationPath path);
+  DescriptorSecretKey derive([ByRef] DerivationPath path);
 
   [Throws=BdkError]
-  DescriptorSecretKey extend(DerivationPath path);
+  DescriptorSecretKey extend([ByRef] DerivationPath path);
 
   DescriptorPublicKey as_public();
 
@@ -210,10 +210,10 @@ interface DescriptorPublicKey {
   constructor(string public_key);
 
   [Throws=BdkError]
-  DescriptorPublicKey derive(DerivationPath path);
+  DescriptorPublicKey derive([ByRef] DerivationPath path);
 
   [Throws=BdkError]
-  DescriptorPublicKey extend(DerivationPath path);
+  DescriptorPublicKey extend([ByRef] DerivationPath path);
 
   string as_string();
 };
@@ -223,28 +223,28 @@ interface Descriptor {
   constructor(string descriptor, Network network);
 
   [Name=new_bip44]
-  constructor(DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
+  constructor([ByRef] DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
 
   [Name=new_bip44_public]
-  constructor(DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
+  constructor([ByRef] DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
 
   [Name=new_bip49]
-  constructor(DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
+  constructor([ByRef] DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
 
   [Name=new_bip49_public]
-  constructor(DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
+  constructor([ByRef] DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
 
   [Name=new_bip84]
-  constructor(DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
+  constructor([ByRef] DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
 
   [Name=new_bip84_public]
-  constructor(DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
+  constructor([ByRef] DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
 
   [Name=new_bip86]
-  constructor(DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
+  constructor([ByRef] DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
 
   [Name=new_bip86_public]
-  constructor(DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
+  constructor([ByRef] DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
 
   string as_string();
 
@@ -262,7 +262,7 @@ interface EsploraClient {
   Update scan(Wallet wallet, u64 stop_gap, u64 parallel_requests);
 
   [Throws=BdkError]
-  void broadcast(Transaction transaction);
+  void broadcast([ByRef] Transaction transaction);
 };
 
 // ------------------------------------------------------------------------
diff --git a/bdk-ffi/src/bitcoin.rs b/bdk-ffi/src/bitcoin.rs
index c5e521a0..effa01a9 100644
--- a/bdk-ffi/src/bitcoin.rs
+++ b/bdk-ffi/src/bitcoin.rs
@@ -14,7 +14,6 @@ use std::io::Cursor;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 
-/// A Bitcoin script.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Script(pub(crate) BdkScriptBuf);
 
@@ -36,13 +35,9 @@ impl From<BdkScriptBuf> for Script {
 }
 
 pub enum Network {
-    /// Mainnet Bitcoin.
     Bitcoin,
-    /// Bitcoin's testnet network.
     Testnet,
-    /// Bitcoin's signet network.
     Signet,
-    /// Bitcoin's regtest network.
     Regtest,
 }
 
@@ -69,7 +64,6 @@ impl From<BdkNetwork> for Network {
     }
 }
 
-/// A Bitcoin address.
 #[derive(Debug, PartialEq, Eq)]
 pub struct Address {
     inner: BdkAddress<NetworkChecked>,
@@ -141,7 +135,6 @@ impl From<BdkAddress> for Address {
     }
 }
 
-/// A Bitcoin transaction.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Transaction {
     inner: BdkTransaction,
@@ -242,7 +235,6 @@ impl PartiallySignedTransaction {
     //     txid.to_hex()
     // }
 
-    /// Return the transaction.
     pub(crate) fn extract_tx(&self) -> Arc<Transaction> {
         let tx = self.inner.lock().unwrap().clone().extract_tx();
         Arc::new(tx.into())
@@ -293,12 +285,9 @@ impl From<BdkPartiallySignedTransaction> for PartiallySignedTransaction {
     }
 }
 
-/// A reference to a transaction output.
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct OutPoint {
-    /// The referenced transaction's txid.
     pub txid: String,
-    /// The index of the referenced output in its transaction's vout.
     pub vout: u32,
 }
 
@@ -311,12 +300,9 @@ impl From<&OutPoint> for BdkOutPoint {
     }
 }
 
-/// A transaction output, which defines new coins to be created from old ones.
 #[derive(Debug, Clone)]
 pub struct TxOut {
-    /// The value of the output, in satoshis.
     pub value: u64,
-    /// The address of the output.
     pub script_pubkey: Arc<Script>,
 }
 
diff --git a/bdk-ffi/src/descriptor.rs b/bdk-ffi/src/descriptor.rs
index 0e8f1a19..b86878a4 100644
--- a/bdk-ffi/src/descriptor.rs
+++ b/bdk-ffi/src/descriptor.rs
@@ -15,7 +15,6 @@ use bdk::Error as BdkError;
 use bdk::KeychainKind;
 
 use std::str::FromStr;
-use std::sync::Arc;
 
 #[derive(Debug)]
 pub struct Descriptor {
@@ -35,7 +34,7 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip44(
-        secret_key: Arc<DescriptorSecretKey>,
+        secret_key: &DescriptorSecretKey,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
@@ -62,7 +61,7 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip44_public(
-        public_key: Arc<DescriptorPublicKey>,
+        public_key: &DescriptorPublicKey,
         fingerprint: String,
         keychain_kind: KeychainKind,
         network: Network,
@@ -93,7 +92,7 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip49(
-        secret_key: Arc<DescriptorSecretKey>,
+        secret_key: &DescriptorSecretKey,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
@@ -120,7 +119,7 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip49_public(
-        public_key: Arc<DescriptorPublicKey>,
+        public_key: &DescriptorPublicKey,
         fingerprint: String,
         keychain_kind: KeychainKind,
         network: Network,
@@ -151,7 +150,7 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip84(
-        secret_key: Arc<DescriptorSecretKey>,
+        secret_key: &DescriptorSecretKey,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
@@ -178,7 +177,7 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip84_public(
-        public_key: Arc<DescriptorPublicKey>,
+        public_key: &DescriptorPublicKey,
         fingerprint: String,
         keychain_kind: KeychainKind,
         network: Network,
@@ -209,7 +208,7 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip86(
-        secret_key: Arc<DescriptorSecretKey>,
+        secret_key: &DescriptorSecretKey,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
@@ -236,7 +235,7 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip86_public(
-        public_key: Arc<DescriptorPublicKey>,
+        public_key: &DescriptorPublicKey,
         fingerprint: String,
         keychain_kind: KeychainKind,
         network: Network,
@@ -277,9 +276,6 @@ impl Descriptor {
     }
 }
 
-// // The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// // These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// // crate.
 #[cfg(test)]
 mod test {
     use crate::*;
@@ -288,83 +284,73 @@ mod test {
     use bdk::descriptor::DescriptorError::Key;
     use bdk::keys::KeyError::InvalidNetwork;
 
-    use std::sync::Arc;
-
     fn get_descriptor_secret_key() -> DescriptorSecretKey {
         let mnemonic = Mnemonic::from_string("chaos fabric time speed sponsor all flat solution wisdom trophy crack object robot pave observe combine where aware bench orient secret primary cable detect".to_string()).unwrap();
-        DescriptorSecretKey::new(Network::Testnet, Arc::new(mnemonic), None)
+        DescriptorSecretKey::new(Network::Testnet, &mnemonic, None)
     }
 
     #[test]
     fn test_descriptor_templates() {
-        let master: Arc<DescriptorSecretKey> = Arc::new(get_descriptor_secret_key());
+        let master: DescriptorSecretKey = get_descriptor_secret_key();
         println!("Master: {:?}", master.as_string());
         // tprv8ZgxMBicQKsPdWuqM1t1CDRvQtQuBPyfL6GbhQwtxDKgUAVPbxmj71pRA8raTqLrec5LyTs5TqCxdABcZr77bt2KyWA5bizJHnC4g4ysm4h
         let handmade_public_44 = master
-            .derive(Arc::new(
-                DerivationPath::new("m/44h/1h/0h".to_string()).unwrap(),
-            ))
+            .derive(&DerivationPath::new("m/44h/1h/0h".to_string()).unwrap())
             .unwrap()
             .as_public();
         println!("Public 44: {}", handmade_public_44.as_string());
         // Public 44: [d1d04177/44'/1'/0']tpubDCoPjomfTqh1e7o1WgGpQtARWtkueXQAepTeNpWiitS3Sdv8RKJ1yvTrGHcwjDXp2SKyMrTEca4LoN7gEUiGCWboyWe2rz99Kf4jK4m2Zmx/*
         let handmade_public_49 = master
-            .derive(Arc::new(
-                DerivationPath::new("m/49h/1h/0h".to_string()).unwrap(),
-            ))
+            .derive(&DerivationPath::new("m/49h/1h/0h".to_string()).unwrap())
             .unwrap()
             .as_public();
         println!("Public 49: {}", handmade_public_49.as_string());
         // Public 49: [d1d04177/49'/1'/0']tpubDC65ZRvk1NDddHrVAUAZrUPJ772QXzooNYmPywYF9tMyNLYKf5wpKE7ZJvK9kvfG3FV7rCsHBNXy1LVKW95jrmC7c7z4hq7a27aD2sRrAhR/*
         let handmade_public_84 = master
-            .derive(Arc::new(
-                DerivationPath::new("m/84h/1h/0h".to_string()).unwrap(),
-            ))
+            .derive(&DerivationPath::new("m/84h/1h/0h".to_string()).unwrap())
             .unwrap()
             .as_public();
         println!("Public 84: {}", handmade_public_84.as_string());
         // Public 84: [d1d04177/84'/1'/0']tpubDDNxbq17egjFk2edjv8oLnzxk52zny9aAYNv9CMqTzA4mQDiQq818sEkNe9Gzmd4QU8558zftqbfoVBDQorG3E4Wq26tB2JeE4KUoahLkx6/*
         let handmade_public_86 = master
-            .derive(Arc::new(
-                DerivationPath::new("m/86h/1h/0h".to_string()).unwrap(),
-            ))
+            .derive(&DerivationPath::new("m/86h/1h/0h".to_string()).unwrap())
             .unwrap()
             .as_public();
         println!("Public 86: {}", handmade_public_86.as_string());
         // Public 86: [d1d04177/86'/1'/0']tpubDCJzjbcGbdEfXMWaL6QmgVmuSfXkrue7m2YNoacWwyc7a2XjXaKojRqNEbo41CFL3PyYmKdhwg2fkGpLX4SQCbQjCGxAkWHJTw9WEeenrJb/*
         let template_private_44 =
-            Descriptor::new_bip44(master.clone(), KeychainKind::External, Network::Testnet);
+            Descriptor::new_bip44(&master, KeychainKind::External, Network::Testnet);
         let template_private_49 =
-            Descriptor::new_bip49(master.clone(), KeychainKind::External, Network::Testnet);
+            Descriptor::new_bip49(&master, KeychainKind::External, Network::Testnet);
         let template_private_84 =
-            Descriptor::new_bip84(master.clone(), KeychainKind::External, Network::Testnet);
+            Descriptor::new_bip84(&master, KeychainKind::External, Network::Testnet);
         let template_private_86 =
-            Descriptor::new_bip86(master, KeychainKind::External, Network::Testnet);
+            Descriptor::new_bip86(&master, KeychainKind::External, Network::Testnet);
         // the extended public keys are the same when creating them manually as they are with the templates
         println!("Template 49: {}", template_private_49.as_string());
         println!("Template 44: {}", template_private_44.as_string());
         println!("Template 84: {}", template_private_84.as_string());
         println!("Template 86: {}", template_private_86.as_string());
         let template_public_44 = Descriptor::new_bip44_public(
-            handmade_public_44,
+            &handmade_public_44,
             "d1d04177".to_string(),
             KeychainKind::External,
             Network::Testnet,
         );
         let template_public_49 = Descriptor::new_bip49_public(
-            handmade_public_49,
+            &handmade_public_49,
             "d1d04177".to_string(),
             KeychainKind::External,
             Network::Testnet,
         );
         let template_public_84 = Descriptor::new_bip84_public(
-            handmade_public_84,
+            &handmade_public_84,
             "d1d04177".to_string(),
             KeychainKind::External,
             Network::Testnet,
         );
         let template_public_86 = Descriptor::new_bip86_public(
-            handmade_public_86,
+            &handmade_public_86,
             "d1d04177".to_string(),
             KeychainKind::External,
             Network::Testnet,
diff --git a/bdk-ffi/src/esplora.rs b/bdk-ffi/src/esplora.rs
index e81ac8ac..27c2f3f4 100644
--- a/bdk-ffi/src/esplora.rs
+++ b/bdk-ffi/src/esplora.rs
@@ -1,11 +1,12 @@
 use crate::wallet::{Update, Wallet};
-use std::ops::Deref;
 
+use bdk::bitcoin::Transaction as BdkTransaction;
 use bdk::wallet::Update as BdkUpdate;
 use bdk::Error as BdkError;
 use bdk_esplora::esplora_client::{BlockingClient, Builder};
 use bdk_esplora::EsploraExt;
 
+use crate::bitcoin::Transaction;
 use std::sync::Arc;
 
 pub struct EsploraClient(BlockingClient);
@@ -57,8 +58,8 @@ impl EsploraClient {
 
     // pub fn sync();
 
-    pub fn broadcast(&self, transaction: Arc<crate::bitcoin::Transaction>) -> Result<(), BdkError> {
-        let bdk_transaction: bdk::bitcoin::Transaction = transaction.deref().clone().into();
+    pub fn broadcast(&self, transaction: &Transaction) -> Result<(), BdkError> {
+        let bdk_transaction: BdkTransaction = transaction.clone().into();
         self.0
             .broadcast(&bdk_transaction)
             .map_err(|e| BdkError::Generic(e.to_string()))
diff --git a/bdk-ffi/src/keys.rs b/bdk-ffi/src/keys.rs
index 1f996b9f..45e19353 100644
--- a/bdk-ffi/src/keys.rs
+++ b/bdk-ffi/src/keys.rs
@@ -18,14 +18,11 @@ use std::ops::Deref;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 
-/// Mnemonic phrases are a human-readable version of the private keys.
-/// Supported number of words are 12, 15, 18, 21 and 24.
 pub(crate) struct Mnemonic {
     inner: BdkMnemonic,
 }
 
 impl Mnemonic {
-    /// Generates Mnemonic with a random entropy
     pub(crate) fn new(word_count: WordCount) -> Self {
         // TODO 4: I DON'T KNOW IF THIS IS A DECENT WAY TO GENERATE ENTROPY PLEASE CONFIRM
         let mut rng = rand::thread_rng();
@@ -38,22 +35,18 @@ impl Mnemonic {
         Mnemonic { inner: mnemonic }
     }
 
-    /// Parse a Mnemonic with given string
     pub(crate) fn from_string(mnemonic: String) -> Result<Self, BdkError> {
         BdkMnemonic::from_str(&mnemonic)
             .map(|m| Mnemonic { inner: m })
             .map_err(|e| BdkError::Generic(e.to_string()))
     }
 
-    /// Create a new Mnemonic in the specified language from the given entropy.
-    /// Entropy must be a multiple of 32 bits (4 bytes) and 128-256 bits in length.
     pub(crate) fn from_entropy(entropy: Vec<u8>) -> Result<Self, BdkError> {
         BdkMnemonic::from_entropy(entropy.as_slice())
             .map(|m| Mnemonic { inner: m })
             .map_err(|e| BdkError::Generic(e.to_string()))
     }
 
-    /// Returns Mnemonic as string
     pub(crate) fn as_string(&self) -> String {
         self.inner.to_string()
     }
@@ -79,7 +72,7 @@ pub struct DescriptorSecretKey {
 }
 
 impl DescriptorSecretKey {
-    pub(crate) fn new(network: Network, mnemonic: Arc<Mnemonic>, password: Option<String>) -> Self {
+    pub(crate) fn new(network: Network, mnemonic: &Mnemonic, password: Option<String>) -> Self {
         let mnemonic = mnemonic.inner.clone();
         let xkey: ExtendedKey = (mnemonic, password).into_extended_key().unwrap();
         let descriptor_secret_key = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
@@ -101,7 +94,7 @@ impl DescriptorSecretKey {
         })
     }
 
-    pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
+    pub(crate) fn derive(&self, path: &DerivationPath) -> Result<Arc<Self>, BdkError> {
         let secp = Secp256k1::new();
         let descriptor_secret_key = &self.inner;
         let path = path.inner_mutex.lock().unwrap().deref().clone();
@@ -131,7 +124,7 @@ impl DescriptorSecretKey {
         }
     }
 
-    pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
+    pub(crate) fn extend(&self, path: &DerivationPath) -> Result<Arc<Self>, BdkError> {
         let descriptor_secret_key = &self.inner;
         let path = path.inner_mutex.lock().unwrap().deref().clone();
         match descriptor_secret_key {
@@ -164,7 +157,6 @@ impl DescriptorSecretKey {
         })
     }
 
-    /// Get the private key as bytes.
     pub(crate) fn secret_bytes(&self) -> Vec<u8> {
         let inner = &self.inner;
         let secret_bytes: Vec<u8> = match inner {
@@ -201,7 +193,7 @@ impl DescriptorPublicKey {
         })
     }
 
-    pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
+    pub(crate) fn derive(&self, path: &DerivationPath) -> Result<Arc<Self>, BdkError> {
         let secp = Secp256k1::new();
         let descriptor_public_key = &self.inner;
         let path = path.inner_mutex.lock().unwrap().deref().clone();
@@ -232,7 +224,7 @@ impl DescriptorPublicKey {
         }
     }
 
-    pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
+    pub(crate) fn extend(&self, path: &DerivationPath) -> Result<Arc<Self>, BdkError> {
         let descriptor_public_key = &self.inner;
         let path = path.inner_mutex.lock().unwrap().deref().clone();
         match descriptor_public_key {
@@ -261,10 +253,7 @@ impl DescriptorPublicKey {
         self.inner.to_string()
     }
 }
-//
-// // The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// // These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// // crate.
+
 #[cfg(test)]
 mod test {
     use crate::keys::{DerivationPath, DescriptorPublicKey, DescriptorSecretKey, Mnemonic};
@@ -275,39 +264,39 @@ mod test {
 
     fn get_inner() -> DescriptorSecretKey {
         let mnemonic = Mnemonic::from_string("chaos fabric time speed sponsor all flat solution wisdom trophy crack object robot pave observe combine where aware bench orient secret primary cable detect".to_string()).unwrap();
-        DescriptorSecretKey::new(Network::Testnet.into(), Arc::new(mnemonic), None)
+        DescriptorSecretKey::new(Network::Testnet.into(), &mnemonic, None)
     }
 
     fn derive_dsk(
         key: &DescriptorSecretKey,
         path: &str,
     ) -> Result<Arc<DescriptorSecretKey>, BdkError> {
-        let path = Arc::new(DerivationPath::new(path.to_string()).unwrap());
-        key.derive(path)
+        let path = DerivationPath::new(path.to_string()).unwrap();
+        key.derive(&path)
     }
 
     fn extend_dsk(
         key: &DescriptorSecretKey,
         path: &str,
     ) -> Result<Arc<DescriptorSecretKey>, BdkError> {
-        let path = Arc::new(DerivationPath::new(path.to_string()).unwrap());
-        key.extend(path)
+        let path = DerivationPath::new(path.to_string()).unwrap();
+        key.extend(&path)
     }
 
     fn derive_dpk(
         key: &DescriptorPublicKey,
         path: &str,
     ) -> Result<Arc<DescriptorPublicKey>, BdkError> {
-        let path = Arc::new(DerivationPath::new(path.to_string()).unwrap());
-        key.derive(path)
+        let path = DerivationPath::new(path.to_string()).unwrap();
+        key.derive(&path)
     }
 
     fn extend_dpk(
         key: &DescriptorPublicKey,
         path: &str,
     ) -> Result<Arc<DescriptorPublicKey>, BdkError> {
-        let path = Arc::new(DerivationPath::new(path.to_string()).unwrap());
-        key.extend(path)
+        let path = DerivationPath::new(path.to_string()).unwrap();
+        key.extend(&path)
     }
 
     #[test]
@@ -347,7 +336,7 @@ mod test {
         assert_eq!(extended_dpk.as_string(), "tpubD6NzVbkrYhZ4WywdEfYbbd62yuvqLjAZuPsNyvzCNV85JekAEMbKHWSHLF9h3j45SxewXDcLv328B1SEZrxg4iwGfmdt1pDFjZiTkGiFqGa/0/*");
         let wif = "L2wTu6hQrnDMiFNWA5na6jB12ErGQqtXwqpSL7aWquJaZG8Ai3ch";
         let extended_key = DescriptorSecretKey::from_string(wif.to_string()).unwrap();
-        let result = extended_key.derive(Arc::new(DerivationPath::new("m/0".to_string()).unwrap()));
+        let result = extended_key.derive(&DerivationPath::new("m/0".to_string()).unwrap());
         dbg!(&result);
         assert!(result.is_err());
     }
diff --git a/bdk-ffi/src/lib.rs b/bdk-ffi/src/lib.rs
index 1b055f71..b4ce7fda 100644
--- a/bdk-ffi/src/lib.rs
+++ b/bdk-ffi/src/lib.rs
@@ -36,86 +36,4 @@ use bdk::KeychainKind;
 
 uniffi::include_scaffolding!("bdk");
 
-// #[derive(Debug, Clone)]
-// pub struct TxIn {
-//     pub previous_output: OutPoint,
-//     pub script_sig: Arc<Script>,
-//     pub sequence: u32,
-//     pub witness: Vec<Vec<u8>>,
-// }
-//
-// impl From<&BdkTxIn> for TxIn {
-//     fn from(tx_in: &BdkTxIn) -> Self {
-//         TxIn {
-//             previous_output: OutPoint {
-//                 txid: tx_in.previous_output.txid.to_string(),
-//                 vout: tx_in.previous_output.vout,
-//             },
-//             script_sig: Arc::new(Script {
-//                 inner: tx_in.script_sig.clone(),
-//             }),
-//             sequence: tx_in.sequence.0,
-//             witness: tx_in.witness.to_vec(),
-//         }
-//     }
-// }
-
-// /// The method used to produce an address.
-// #[derive(Debug)]
-// pub enum Payload {
-//     /// P2PKH address.
-//     PubkeyHash { pubkey_hash: Vec<u8> },
-//     /// P2SH address.
-//     ScriptHash { script_hash: Vec<u8> },
-//     /// Segwit address.
-//     WitnessProgram {
-//         /// The witness program version.
-//         version: WitnessVersion,
-//         /// The witness program.
-//         program: Vec<u8>,
-//     },
-// }
-
-// /// The result after calling the TxBuilder finish() function. Contains unsigned PSBT and
-// /// transaction details.
-// pub struct TxBuilderResult {
-//     pub(crate) psbt: Arc<PartiallySignedTransaction>,
-//     pub transaction_details: TransactionDetails,
-// }
-//
-// uniffi::deps::static_assertions::assert_impl_all!(Wallet: Sync, Send);
-//
-// // The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// // These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// // crate.
-// #[cfg(test)]
-// mod test {
-//     use super::Transaction;
-//     use crate::Network::Regtest;
-//     use crate::{Address, Payload};
-//     use assert_matches::assert_matches;
-//     use bdk::bitcoin::hashes::hex::FromHex;
-//     use bdk::bitcoin::util::address::WitnessVersion;
-//
-//     // Verify that bdk-ffi Transaction can be created from valid bytes and serialized back into the same bytes.
-//     #[test]
-//     fn test_transaction_serde() {
-//         let test_tx_bytes = Vec::from_hex("020000000001031cfbc8f54fbfa4a33a30068841371f80dbfe166211242213188428f437445c91000000006a47304402206fbcec8d2d2e740d824d3d36cc345b37d9f65d665a99f5bd5c9e8d42270a03a8022013959632492332200c2908459547bf8dbf97c65ab1a28dec377d6f1d41d3d63e012103d7279dfb90ce17fe139ba60a7c41ddf605b25e1c07a4ddcb9dfef4e7d6710f48feffffff476222484f5e35b3f0e43f65fc76e21d8be7818dd6a989c160b1e5039b7835fc00000000171600140914414d3c94af70ac7e25407b0689e0baa10c77feffffffa83d954a62568bbc99cc644c62eb7383d7c2a2563041a0aeb891a6a4055895570000000017160014795d04cc2d4f31480d9a3710993fbd80d04301dffeffffff06fef72f000000000017a91476fd7035cd26f1a32a5ab979e056713aac25796887a5000f00000000001976a914b8332d502a529571c6af4be66399cd33379071c588ac3fda0500000000001976a914fc1d692f8de10ae33295f090bea5fe49527d975c88ac522e1b00000000001976a914808406b54d1044c429ac54c0e189b0d8061667e088ac6eb68501000000001976a914dfab6085f3a8fb3e6710206a5a959313c5618f4d88acbba20000000000001976a914eb3026552d7e3f3073457d0bee5d4757de48160d88ac0002483045022100bee24b63212939d33d513e767bc79300051f7a0d433c3fcf1e0e3bf03b9eb1d70220588dc45a9ce3a939103b4459ce47500b64e23ab118dfc03c9caa7d6bfc32b9c601210354fd80328da0f9ae6eef2b3a81f74f9a6f66761fadf96f1d1d22b1fd6845876402483045022100e29c7e3a5efc10da6269e5fc20b6a1cb8beb92130cc52c67e46ef40aaa5cac5f0220644dd1b049727d991aece98a105563416e10a5ac4221abac7d16931842d5c322012103960b87412d6e169f30e12106bdf70122aabb9eb61f455518322a18b920a4dfa887d30700").unwrap();
-//         let new_tx_from_bytes = Transaction::new(test_tx_bytes.clone()).unwrap();
-//         let serialized_tx_to_bytes = new_tx_from_bytes.serialize();
-//         assert_eq!(test_tx_bytes, serialized_tx_to_bytes);
-//     }
-//
-//     // Verify that bdk-ffi Address.payload includes expected WitnessProgram variant, version and program bytes.
-//     #[test]
-//     fn test_address_witness_program() {
-//         let address =
-//             Address::new("bcrt1qqjn9gky9mkrm3c28e5e87t5akd3twg6xezp0tv".to_string()).unwrap();
-//         let payload = address.payload();
-//         assert_matches!(payload, Payload::WitnessProgram { version, program } => {
-//             assert_eq!(version,WitnessVersion::V0);
-//             assert_eq!(program, Vec::from_hex("04a6545885dd87b8e147cd327f2e9db362b72346").unwrap());
-//         });
-//         assert_eq!(address.network(), Regtest);
-//     }
-// }
+// TODO: TxIn, Payload
diff --git a/bdk-ffi/src/types.rs b/bdk-ffi/src/types.rs
index 52a1a4a3..1f03ea0f 100644
--- a/bdk-ffi/src/types.rs
+++ b/bdk-ffi/src/types.rs
@@ -9,19 +9,14 @@ use bdk::LocalUtxo as BdkLocalUtxo;
 
 use std::sync::Arc;
 
-/// A output script and an amount of satoshis.
 pub struct ScriptAmount {
     pub script: Arc<Script>,
     pub amount: u64,
 }
 
-/// A derived address and the index it was found at.
 pub struct AddressInfo {
-    /// Child index of this address.
     pub index: u32,
-    /// Address.
     pub address: Arc<Address>,
-    /// Type of keychain.
     pub keychain: KeychainKind,
 }
 
@@ -35,22 +30,9 @@ impl From<BdkAddressInfo> for AddressInfo {
     }
 }
 
-/// The address index selection strategy to use to derived an address from the wallet's external
-/// descriptor.
 pub enum AddressIndex {
-    /// Return a new address after incrementing the current descriptor index.
     New,
-    /// Return the address for the current descriptor index if it has not been used in a received
-    /// transaction. Otherwise return a new address as with AddressIndex::New.
-    /// Use with caution, if the wallet has not yet detected an address has been used it could
-    /// return an already used address. This function is primarily meant for situations where the
-    /// caller is untrusted; for example when deriving donation addresses on-demand for a public
-    /// web page.
     LastUnused,
-    /// Return the address for a specific descriptor index. Does not change the current descriptor
-    /// index used by `AddressIndex::New` and `AddressIndex::LastUsed`.
-    /// Use with caution, if an index is given that is less than the current descriptor index
-    /// then the returned address may have already been used.
     Peek { index: u32 },
 }
 
@@ -96,17 +78,11 @@ impl From<&BdkAddressIndex> for AddressIndex {
 }
 
 pub struct Balance {
-    // All coinbase outputs not yet matured
     pub immature: u64,
-    /// Unconfirmed UTXOs generated by a wallet tx
     pub trusted_pending: u64,
-    /// Unconfirmed UTXOs received from an external wallet
     pub untrusted_pending: u64,
-    /// Confirmed and immediately spendable balance
     pub confirmed: u64,
-    /// Get sum of trusted_pending and confirmed coins
     pub trusted_spendable: u64,
-    /// Get the whole balance visible to the wallet
     pub total: u64,
 }
 
diff --git a/bdk-ffi/src/wallet.rs b/bdk-ffi/src/wallet.rs
index 3cb1eb08..e4dcebb3 100644
--- a/bdk-ffi/src/wallet.rs
+++ b/bdk-ffi/src/wallet.rs
@@ -70,20 +70,12 @@ impl Wallet {
             .map_err(|e| BdkError::Generic(e.to_string()))
     }
 
-    pub fn is_mine(&self, script: Arc<Script>) -> bool {
+    pub fn is_mine(&self, script: &Script) -> bool {
         // TODO: Both of the following lines work. Which is better?
         self.get_wallet().is_mine(&script.0)
         // self.get_wallet().is_mine(script.0.clone().as_script())
     }
 
-    /// Sign a transaction with all the wallet's signers, in the order specified by every signer's
-    /// [`SignerOrdering`]. This function returns the `Result` type with an encapsulated `bool` that
-    /// has the value true if the PSBT was finalized, or false otherwise.
-    ///
-    /// The [`SignOptions`] can be used to tweak the behavior of the software signers, and the way
-    /// the transaction is finalized at the end. Note that it can't be guaranteed that *every*
-    /// signers will follow the options, but the "software signers" (WIF keys and `xprv`) defined
-    /// in this library will.
     pub(crate) fn sign(
         &self,
         psbt: Arc<PartiallySignedTransaction>,
@@ -295,10 +287,7 @@ pub struct Update(pub(crate) BdkUpdate);
 //         }
 //     }
 // }
-//
-/// A transaction builder.
-/// After creating the TxBuilder, you set options on it until finally calling finish to consume the builder and generate the transaction.
-/// Each method on the TxBuilder returns an instance of a new TxBuilder with the option set/added.
+
 #[derive(Clone, Debug)]
 pub struct TxBuilder {
     pub(crate) recipients: Vec<(BdkScriptBuf, u64)>,
@@ -331,8 +320,7 @@ impl TxBuilder {
         }
     }
 
-    /// Add a recipient to the internal list.
-    pub(crate) fn add_recipient(&self, script: Arc<Script>, amount: u64) -> Arc<Self> {
+    pub(crate) fn add_recipient(&self, script: &Script, amount: u64) -> Arc<Self> {
         let mut recipients: Vec<(BdkScriptBuf, u64)> = self.recipients.clone();
         recipients.append(&mut vec![(script.0.clone(), amount)]);
 
@@ -353,8 +341,6 @@ impl TxBuilder {
         })
     }
 
-    /// Add a utxo to the internal list of unspendable utxos. It’s important to note that the "must-be-spent"
-    /// utxos added with [TxBuilder.addUtxo] have priority over this. See the Rust docs of the two linked methods for more details.
     pub(crate) fn add_unspendable(&self, unspendable: OutPoint) -> Arc<Self> {
         let mut unspendable_hash_set = self.unspendable.clone();
         unspendable_hash_set.insert(unspendable);
@@ -364,8 +350,6 @@ impl TxBuilder {
         })
     }
 
-    /// Replace the internal list of unspendable utxos with a new list. It’s important to note that the "must-be-spent" utxos added with
-    /// TxBuilder.addUtxo have priority over these. See the Rust docs of the two linked methods for more details.
     pub(crate) fn unspendable(&self, unspendable: Vec<OutPoint>) -> Arc<Self> {
         Arc::new(TxBuilder {
             unspendable: unspendable.into_iter().collect(),
@@ -373,15 +357,10 @@ impl TxBuilder {
         })
     }
 
-    /// Add an outpoint to the internal list of UTXOs that must be spent. These have priority over the "unspendable"
-    /// utxos, meaning that if a utxo is present both in the "utxos" and the "unspendable" list, it will be spent.
     pub(crate) fn add_utxo(&self, outpoint: OutPoint) -> Arc<Self> {
         self.add_utxos(vec![outpoint])
     }
 
-    /// Add the list of outpoints to the internal list of UTXOs that must be spent. If an error occurs while adding
-    /// any of the UTXOs then none of them are added and the error is returned. These have priority over the "unspendable"
-    /// utxos, meaning that if a utxo is present both in the "utxos" and the "unspendable" list, it will be spent.
     pub(crate) fn add_utxos(&self, mut outpoints: Vec<OutPoint>) -> Arc<Self> {
         let mut utxos = self.utxos.to_vec();
         utxos.append(&mut outpoints);
@@ -398,7 +377,6 @@ impl TxBuilder {
         })
     }
 
-    /// Do not spend change outputs. This effectively adds all the change outputs to the "unspendable" list. See TxBuilder.unspendable.
     pub(crate) fn do_not_spend_change(&self) -> Arc<Self> {
         Arc::new(TxBuilder {
             change_policy: ChangeSpendPolicy::ChangeForbidden,
@@ -406,7 +384,6 @@ impl TxBuilder {
         })
     }
 
-    /// Only spend change outputs. This effectively adds all the non-change outputs to the "unspendable" list. See TxBuilder.unspendable.
     pub(crate) fn only_spend_change(&self) -> Arc<Self> {
         Arc::new(TxBuilder {
             change_policy: ChangeSpendPolicy::OnlyChange,
@@ -414,8 +391,6 @@ impl TxBuilder {
         })
     }
 
-    /// Only spend utxos added by [add_utxo]. The wallet will not add additional utxos to the transaction even if they are
-    /// needed to make the transaction valid.
     pub(crate) fn manually_selected_only(&self) -> Arc<Self> {
         Arc::new(TxBuilder {
             manually_selected_only: true,
@@ -423,7 +398,6 @@ impl TxBuilder {
         })
     }
 
-    /// Set a custom fee rate.
     pub(crate) fn fee_rate(&self, sat_per_vb: f32) -> Arc<Self> {
         Arc::new(TxBuilder {
             fee_rate: Some(sat_per_vb),
@@ -431,7 +405,6 @@ impl TxBuilder {
         })
     }
 
-    /// Set an absolute fee.
     pub(crate) fn fee_absolute(&self, fee_amount: u64) -> Arc<Self> {
         Arc::new(TxBuilder {
             fee_absolute: Some(fee_amount),
@@ -439,7 +412,6 @@ impl TxBuilder {
         })
     }
 
-    /// Spend all the available inputs. This respects filters like TxBuilder.unspendable and the change policy.
     pub(crate) fn drain_wallet(&self) -> Arc<Self> {
         Arc::new(TxBuilder {
             drain_wallet: true,
@@ -447,22 +419,13 @@ impl TxBuilder {
         })
     }
 
-    /// Sets the address to drain excess coins to. Usually, when there are excess coins they are sent to a change address
-    /// generated by the wallet. This option replaces the usual change address with an arbitrary ScriptPubKey of your choosing.
-    /// Just as with a change output, if the drain output is not needed (the excess coins are too small) it will not be included
-    /// in the resulting transaction. The only difference is that it is valid to use drain_to without setting any ordinary recipients
-    /// with add_recipient (but it is perfectly fine to add recipients as well). If you choose not to set any recipients, you should
-    /// either provide the utxos that the transaction should spend via add_utxos, or set drain_wallet to spend all of them.
-    /// When bumping the fees of a transaction made with this option, you probably want to use BumpFeeTxBuilder.allow_shrinking
-    /// to allow this output to be reduced to pay for the extra fees.
-    pub(crate) fn drain_to(&self, script: Arc<Script>) -> Arc<Self> {
+    pub(crate) fn drain_to(&self, script: &Script) -> Arc<Self> {
         Arc::new(TxBuilder {
             drain_to: Some(script.0.clone()),
             ..self.clone()
         })
     }
 
-    /// Enable signaling RBF. This will use the default `nsequence` value of `0xFFFFFFFD`.
     pub(crate) fn enable_rbf(&self) -> Arc<Self> {
         Arc::new(TxBuilder {
             rbf: Some(RbfValue::Default),
@@ -470,9 +433,6 @@ impl TxBuilder {
         })
     }
 
-    /// Enable signaling RBF with a specific nSequence value. This can cause conflicts if the wallet's descriptors contain an
-    /// "older" (OP_CSV) operator and the given `nsequence` is lower than the CSV value. If the `nsequence` is higher than `0xFFFFFFFD`
-    /// an error will be thrown, since it would not be a valid nSequence to signal RBF.
     pub(crate) fn enable_rbf_with_sequence(&self, nsequence: u32) -> Arc<Self> {
         Arc::new(TxBuilder {
             rbf: Some(RbfValue::Value(nsequence)),
@@ -488,7 +448,6 @@ impl TxBuilder {
     //     })
     // }
 
-    /// Finish building the transaction. Returns the BIP174 PSBT.
     pub(crate) fn finish(
         &self,
         wallet: &Wallet,
@@ -545,7 +504,6 @@ impl TxBuilder {
     }
 }
 
-// /// The BumpFeeTxBuilder is used to bump the fee on a transaction that has been broadcast and has its RBF flag set to true.
 #[derive(Clone)]
 pub(crate) struct BumpFeeTxBuilder {
     pub(crate) txid: String,
@@ -564,11 +522,6 @@ impl BumpFeeTxBuilder {
         }
     }
 
-    /// Explicitly tells the wallet that it is allowed to reduce the amount of the output matching this script_pubkey
-    /// in order to bump the transaction fee. Without specifying this the wallet will attempt to find a change output to
-    /// shrink instead. Note that the output may shrink to below the dust limit and therefore be removed. If it is preserved
-    /// then it is currently not guaranteed to be in the same position as it was originally. Returns an error if script_pubkey
-    /// can’t be found among the recipients of the transaction we are bumping.
     pub(crate) fn allow_shrinking(&self, script_pubkey: Arc<Script>) -> Arc<Self> {
         Arc::new(Self {
             allow_shrinking: Some(script_pubkey),
@@ -576,7 +529,6 @@ impl BumpFeeTxBuilder {
         })
     }
 
-    /// Enable signaling RBF. This will use the default `nsequence` value of `0xFFFFFFFD`.
     pub(crate) fn enable_rbf(&self) -> Arc<Self> {
         Arc::new(Self {
             rbf: Some(RbfValue::Default),
@@ -584,9 +536,6 @@ impl BumpFeeTxBuilder {
         })
     }
 
-    /// Enable signaling RBF with a specific nSequence value. This can cause conflicts if the wallet's descriptors contain an
-    /// "older" (OP_CSV) operator and the given `nsequence` is lower than the CSV value. If the `nsequence` is higher than `0xFFFFFFFD`
-    /// an error will be thrown, since it would not be a valid nSequence to signal RBF.
     pub(crate) fn enable_rbf_with_sequence(&self, nsequence: u32) -> Arc<Self> {
         Arc::new(Self {
             rbf: Some(RbfValue::Value(nsequence)),
@@ -594,7 +543,6 @@ impl BumpFeeTxBuilder {
         })
     }
 
-    /// Finish building the transaction. Returns the BIP174 PSBT.
     pub(crate) fn finish(
         &self,
         wallet: &Wallet,
@@ -631,9 +579,6 @@ pub enum RbfValue {
     Value(u32),
 }
 
-// // The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// // These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// // crate.
 // #[cfg(test)]
 // mod test {
 //     use crate::database::DatabaseConfig;