diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 757b1ca35a..054da0e9e5 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -46,7 +46,7 @@ use zcash_keys::{
     keys::{UnifiedFullViewingKey, UnifiedSpendingKey},
 };
 use zcash_protocol::{PoolType, ShieldedProtocol};
-use zip321::{self, Payment};
+use zip321::Payment;
 
 use super::InputSource;
 use crate::{
diff --git a/zcash_client_sqlite/src/error.rs b/zcash_client_sqlite/src/error.rs
index 622bcc0077..7c9e48cc39 100644
--- a/zcash_client_sqlite/src/error.rs
+++ b/zcash_client_sqlite/src/error.rs
@@ -8,7 +8,6 @@ use zcash_address::ParseError;
 use zcash_client_backend::data_api::NoteFilter;
 use zcash_keys::keys::AddressGenerationError;
 use zcash_protocol::{consensus::BlockHeight, value::BalanceError, PoolType};
-use zip32;
 
 use crate::{wallet::commitment_tree, AccountUuid};
 
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index ecbbfbbd68..a1f1a2692c 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -75,7 +75,7 @@ use zcash_protocol::{
     value::Zatoshis,
     ShieldedProtocol,
 };
-use zip32::{self, fingerprint::SeedFingerprint, DiversifierIndex};
+use zip32::{fingerprint::SeedFingerprint, DiversifierIndex};
 
 use crate::{error::SqliteClientError, wallet::commitment_tree::SqliteShardStore};
 
@@ -2257,7 +2257,6 @@ mod tests {
     pub(crate) fn fsblockdb_api() {
         use zcash_client_backend::data_api::testing::AddressType;
         use zcash_protocol::{consensus::NetworkConstants, value::Zatoshis};
-        use zip32;
 
         use crate::testing::FsBlockCache;
 
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
index 4269a0813f..1e71ac5012 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
@@ -317,7 +317,7 @@ mod tests {
         memo::MemoBytes,
         value::Zatoshis,
     };
-    use zip32::{self, Scope};
+    use zip32::Scope;
 
     use crate::{
         error::SqliteClientError,
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index 67dad9ed5b..bf3d4cb677 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -7,7 +7,6 @@ use std::fmt;
 use std::sync::mpsc::Sender;
 
 use ::sapling::{
-    self,
     builder::SaplingMetadata,
     prover::{OutputProver, SpendProver},
     Note, PaymentAddress,
@@ -994,10 +993,7 @@ mod testing {
     use rand::RngCore;
     use rand_core::CryptoRng;
 
-    use ::sapling::{
-        self,
-        prover::mock::{MockOutputProver, MockSpendProver},
-    };
+    use ::sapling::prover::mock::{MockOutputProver, MockSpendProver};
     use ::transparent::builder::TransparentSigningSet;
     use zcash_protocol::consensus;
 
@@ -1060,7 +1056,7 @@ mod tests {
     use super::{Builder, Error};
     use crate::transaction::builder::BuildConfig;
 
-    use ::sapling::{self, zip32::ExtendedSpendingKey, Node, Rseed};
+    use ::sapling::{zip32::ExtendedSpendingKey, Node, Rseed};
     use ::transparent::{address::TransparentAddress, builder::TransparentSigningSet};
     use zcash_protocol::{
         consensus::{NetworkUpgrade, Parameters, TEST_NETWORK},
diff --git a/zcash_primitives/src/transaction/mod.rs b/zcash_primitives/src/transaction/mod.rs
index 63c3bc262b..f80a9d3540 100644
--- a/zcash_primitives/src/transaction/mod.rs
+++ b/zcash_primitives/src/transaction/mod.rs
@@ -18,7 +18,7 @@ use std::fmt::Debug;
 use std::io::{self, Read, Write};
 use std::ops::Deref;
 
-use ::sapling::{self, builder as sapling_builder};
+use ::sapling::builder as sapling_builder;
 use ::transparent::bundle::{self as transparent, OutPoint, TxIn, TxOut};
 use zcash_encoding::{CompactSize, Vector};
 use zcash_protocol::{
diff --git a/zcash_primitives/src/transaction/sighash.rs b/zcash_primitives/src/transaction/sighash.rs
index 12be72bef5..90b7641666 100644
--- a/zcash_primitives/src/transaction/sighash.rs
+++ b/zcash_primitives/src/transaction/sighash.rs
@@ -4,7 +4,7 @@ use super::{
     sighash_v4::v4_signature_hash, sighash_v5::v5_signature_hash, Authorization, TransactionData,
     TxDigests, TxVersion,
 };
-use ::sapling::{self, bundle::GrothProofBytes};
+use ::sapling::bundle::GrothProofBytes;
 
 #[cfg(zcash_unstable = "zfuture")]
 use {crate::extensions::transparent::Precondition, zcash_protocol::value::Zatoshis};
diff --git a/zcash_primitives/src/transaction/sighash_v4.rs b/zcash_primitives/src/transaction/sighash_v4.rs
index 2fa95ae5b3..de0186b0db 100644
--- a/zcash_primitives/src/transaction/sighash_v4.rs
+++ b/zcash_primitives/src/transaction/sighash_v4.rs
@@ -1,10 +1,7 @@
 use blake2b_simd::{Hash as Blake2bHash, Params as Blake2bParams};
 use ff::PrimeField;
 
-use ::sapling::{
-    self,
-    bundle::{GrothProofBytes, OutputDescription, SpendDescription},
-};
+use ::sapling::bundle::{GrothProofBytes, OutputDescription, SpendDescription};
 use ::transparent::{
     bundle::{self as transparent, TxIn, TxOut},
     sighash::{SIGHASH_ANYONECANPAY, SIGHASH_MASK, SIGHASH_NONE, SIGHASH_SINGLE},
diff --git a/zcash_primitives/src/transaction/tests.rs b/zcash_primitives/src/transaction/tests.rs
index a2514ed383..66fe4e0ef7 100644
--- a/zcash_primitives/src/transaction/tests.rs
+++ b/zcash_primitives/src/transaction/tests.rs
@@ -8,7 +8,6 @@ use ::transparent::{address::Script, sighash::TransparentAuthorizingContext};
 use zcash_protocol::{consensus::BranchId, value::Zatoshis};
 
 use super::{
-    sapling,
     sighash::SignableInput,
     sighash_v4::v4_signature_hash,
     sighash_v5::v5_signature_hash,
diff --git a/zcash_primitives/src/transaction/txid.rs b/zcash_primitives/src/transaction/txid.rs
index 219b17bc5b..108b83a365 100644
--- a/zcash_primitives/src/transaction/txid.rs
+++ b/zcash_primitives/src/transaction/txid.rs
@@ -13,10 +13,7 @@ use zcash_protocol::{
     value::ZatBalance,
 };
 
-use ::sapling::{
-    self,
-    bundle::{OutputDescription, SpendDescription},
-};
+use ::sapling::bundle::{OutputDescription, SpendDescription};
 
 use super::{
     Authorization, Authorized, TransactionDigest, TransparentDigests, TxDigests, TxId, TxVersion,