diff --git a/payjoin-cli/src/app/v2/mod.rs b/payjoin-cli/src/app/v2/mod.rs
index 9d8a4e27c..c9489e816 100644
--- a/payjoin-cli/src/app/v2/mod.rs
+++ b/payjoin-cli/src/app/v2/mod.rs
@@ -195,7 +195,7 @@ impl App {
             SendSession::V2GetContext(context) =>
                 self.get_proposed_payjoin_psbt(context, persister).await?,
             SendSession::ProposalReceived(proposal) => {
-                self.process_pj_response(proposal.clone())?;
+                self.process_pj_response(proposal)?;
                 return Ok(());
             }
             _ => return Err(anyhow!("Unexpected sender state")),
@@ -232,7 +232,7 @@ impl App {
             match res {
                 Ok(OptionalTransitionOutcome::Progress(psbt)) => {
                     println!("Proposal received. Processing...");
-                    self.process_pj_response(psbt.clone())?;
+                    self.process_pj_response(psbt)?;
                     return Ok(());
                 }
                 Ok(OptionalTransitionOutcome::Stasis(current_state)) => {
@@ -446,7 +446,7 @@ impl App {
         proposal.process_res(&res.bytes().await?, ohttp_ctx).save(persister)?;
         println!(
             "Response successful. Watch mempool for successful Payjoin. TXID: {}",
-            payjoin_psbt.extract_tx_unchecked_fee_rate().clone().compute_txid()
+            payjoin_psbt.extract_tx_unchecked_fee_rate().compute_txid()
         );
         Ok(())
     }
diff --git a/payjoin-cli/src/db/v2.rs b/payjoin-cli/src/db/v2.rs
index 1e523bc34..3eabd32fe 100644
--- a/payjoin-cli/src/db/v2.rs
+++ b/payjoin-cli/src/db/v2.rs
@@ -42,11 +42,11 @@ impl SenderPersister {
         send_tree.insert(id.as_ref(), value.as_slice())?;
         send_tree.flush()?;
 
-        Ok(Self { db: db.clone(), session_id: id })
+        Ok(Self { db, session_id: id })
     }
 
     pub fn from_id(db: Arc<Database>, id: SessionId) -> crate::db::Result<Self> {
-        Ok(Self { db: db.clone(), session_id: id })
+        Ok(Self { db, session_id: id })
     }
 }
 
@@ -112,11 +112,11 @@ impl ReceiverPersister {
         recv_tree.insert(id.as_ref(), value.as_slice())?;
         recv_tree.flush()?;
 
-        Ok(Self { db: db.clone(), session_id: id })
+        Ok(Self { db, session_id: id })
     }
 
     pub fn from_id(db: Arc<Database>, id: SessionId) -> crate::db::Result<Self> {
-        Ok(Self { db: db.clone(), session_id: id })
+        Ok(Self { db, session_id: id })
     }
 }
 
diff --git a/payjoin/src/core/receive/v2/mod.rs b/payjoin/src/core/receive/v2/mod.rs
index dad80f701..4a293d3a9 100644
--- a/payjoin/src/core/receive/v2/mod.rs
+++ b/payjoin/src/core/receive/v2/mod.rs
@@ -405,7 +405,7 @@ impl Receiver<Initialized> {
         let new_state = Receiver {
             state: UncheckedProposal {
                 v1: event,
-                context: SessionContext { e: reply_key, ..self.state.context.clone() },
+                context: SessionContext { e: reply_key, ..self.state.context },
             },
         };
 
@@ -478,8 +478,7 @@ impl Receiver<UncheckedProposal> {
     }
 
     pub(crate) fn apply_maybe_inputs_owned(self, v1: v1::MaybeInputsOwned) -> ReceiveSession {
-        let new_state =
-            Receiver { state: MaybeInputsOwned { v1, context: self.state.context.clone() } };
+        let new_state = Receiver { state: MaybeInputsOwned { v1, context: self.state.context } };
         ReceiveSession::MaybeInputsOwned(new_state)
     }
 }
@@ -531,8 +530,7 @@ impl Receiver<MaybeInputsOwned> {
     }
 
     pub(crate) fn apply_maybe_inputs_seen(self, v1: v1::MaybeInputsSeen) -> ReceiveSession {
-        let new_state =
-            Receiver { state: MaybeInputsSeen { v1, context: self.state.context.clone() } };
+        let new_state = Receiver { state: MaybeInputsSeen { v1, context: self.state.context } };
         ReceiveSession::MaybeInputsSeen(new_state)
     }
 }
@@ -572,13 +570,12 @@ impl Receiver<MaybeInputsSeen> {
         };
         MaybeFatalTransition::success(
             SessionEvent::OutputsUnknown(inner.clone()),
-            Receiver { state: OutputsUnknown { inner, context: self.state.context.clone() } },
+            Receiver { state: OutputsUnknown { inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_outputs_unknown(self, inner: v1::OutputsUnknown) -> ReceiveSession {
-        let new_state =
-            Receiver { state: OutputsUnknown { inner, context: self.state.context.clone() } };
+        let new_state = Receiver { state: OutputsUnknown { inner, context: self.state.context } };
         ReceiveSession::OutputsUnknown(new_state)
     }
 }
@@ -617,13 +614,12 @@ impl Receiver<OutputsUnknown> {
         };
         MaybeFatalTransition::success(
             SessionEvent::WantsOutputs(inner.clone()),
-            Receiver { state: WantsOutputs { v1: inner, context: self.state.context.clone() } },
+            Receiver { state: WantsOutputs { v1: inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_wants_outputs(self, v1: v1::WantsOutputs) -> ReceiveSession {
-        let new_state =
-            Receiver { state: WantsOutputs { v1, context: self.state.context.clone() } };
+        let new_state = Receiver { state: WantsOutputs { v1, context: self.state.context } };
         ReceiveSession::WantsOutputs(new_state)
     }
 }
@@ -672,12 +668,12 @@ impl Receiver<WantsOutputs> {
         let inner = self.state.v1.clone().commit_outputs();
         NextStateTransition::success(
             SessionEvent::WantsInputs(inner.clone()),
-            Receiver { state: WantsInputs { v1: inner, context: self.state.context.clone() } },
+            Receiver { state: WantsInputs { v1: inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_wants_inputs(self, v1: v1::WantsInputs) -> ReceiveSession {
-        let new_state = Receiver { state: WantsInputs { v1, context: self.state.context.clone() } };
+        let new_state = Receiver { state: WantsInputs { v1, context: self.state.context } };
         ReceiveSession::WantsInputs(new_state)
     }
 }
@@ -728,15 +724,12 @@ impl Receiver<WantsInputs> {
         let inner = self.state.v1.clone().commit_inputs();
         NextStateTransition::success(
             SessionEvent::ProvisionalProposal(inner.clone()),
-            Receiver {
-                state: ProvisionalProposal { v1: inner, context: self.state.context.clone() },
-            },
+            Receiver { state: ProvisionalProposal { v1: inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_provisional_proposal(self, v1: v1::ProvisionalProposal) -> ReceiveSession {
-        let new_state =
-            Receiver { state: ProvisionalProposal { v1, context: self.state.context.clone() } };
+        let new_state = Receiver { state: ProvisionalProposal { v1, context: self.state.context } };
         ReceiveSession::ProvisionalProposal(new_state)
     }
 }
@@ -780,13 +773,12 @@ impl Receiver<ProvisionalProposal> {
         };
         MaybeTransientTransition::success(
             SessionEvent::PayjoinProposal(inner.clone()),
-            Receiver { state: PayjoinProposal { v1: inner, context: self.state.context.clone() } },
+            Receiver { state: PayjoinProposal { v1: inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_payjoin_proposal(self, v1: v1::PayjoinProposal) -> ReceiveSession {
-        let new_state =
-            Receiver { state: PayjoinProposal { v1, context: self.state.context.clone() } };
+        let new_state = Receiver { state: PayjoinProposal { v1, context: self.state.context } };
         ReceiveSession::PayjoinProposal(new_state)
     }
 }
@@ -904,7 +896,7 @@ pub(crate) fn pj_uri<'a>(
 ) -> crate::PjUri<'a> {
     use crate::uri::{PayjoinExtras, UrlExt};
     let id = session_context.id();
-    let mut pj = subdir(&session_context.directory, &id).clone();
+    let mut pj = subdir(&session_context.directory, &id);
     pj.set_receiver_pubkey(session_context.s.public_key().clone());
     pj.set_ohttp(session_context.ohttp_keys.clone());
     pj.set_exp(session_context.expiry);