diff --git a/crates/shared/src/fee_subsidy/cow_token.rs b/crates/shared/src/fee_subsidy/cow_token.rs
index 263717b721..d0cb507990 100644
--- a/crates/shared/src/fee_subsidy/cow_token.rs
+++ b/crates/shared/src/fee_subsidy/cow_token.rs
@@ -1,9 +1,7 @@
 use super::{FeeSubsidizing, Subsidy, SubsidyParameters};
-use crate::transport::buffered::{Buffered, Configuration};
 use anyhow::{Context, Result};
 use cached::{Cached, TimedSizedCache};
 use contracts::{CowProtocolToken, CowProtocolVirtualToken};
-use ethcontract::Web3;
 use primitive_types::{H160, U256};
 use std::{collections::BTreeMap, sync::Mutex, time::Duration};
 
@@ -72,20 +70,6 @@ impl CowSubsidy {
             false,
         );
 
-        // Create buffered transport to do the two calls we make per user in one batch.
-        let transport = token.raw_instance().web3().transport().clone();
-        let buffered = Buffered::with_config(
-            transport,
-            Configuration {
-                max_concurrent_requests: None,
-                max_batch_len: 2,
-                batch_delay: Duration::from_secs(1),
-            },
-        );
-        let web3 = Web3::new(buffered);
-        let token = CowProtocolToken::at(&web3, token.address());
-        let vtoken = CowProtocolVirtualToken::at(&web3, vtoken.address());
-
         Self {
             token,
             vtoken,
diff --git a/crates/shared/src/lib.rs b/crates/shared/src/lib.rs
index 99dff40018..78c7331c8f 100644
--- a/crates/shared/src/lib.rs
+++ b/crates/shared/src/lib.rs
@@ -47,7 +47,10 @@ pub mod transport;
 pub mod univ3_router_api;
 pub mod zeroex_api;
 
-use self::{http_client::HttpClientFactory, transport::http::HttpTransport};
+use self::{
+    http_client::HttpClientFactory,
+    transport::{buffered::Buffered, http::HttpTransport},
+};
 use ethcontract::{
     batch::CallBatch,
     dyns::{DynTransport, DynWeb3},
@@ -64,11 +67,11 @@ pub type Web3CallBatch = CallBatch<Web3Transport>;
 
 /// Create a Web3 instance.
 pub fn web3(http_factory: &HttpClientFactory, url: &Url, name: impl ToString) -> Web3 {
-    let transport = Web3Transport::new(HttpTransport::new(
+    let transport = Web3Transport::new(Buffered::new(HttpTransport::new(
         http_factory.configure(|builder| builder.cookie_store(true)),
         url.clone(),
         name.to_string(),
-    ));
+    )));
     Web3::new(transport)
 }
 
diff --git a/crates/solver/src/settlement_post_processing/mod.rs b/crates/solver/src/settlement_post_processing/mod.rs
index f66ccad0db..ab58bf3db6 100644
--- a/crates/solver/src/settlement_post_processing/mod.rs
+++ b/crates/solver/src/settlement_post_processing/mod.rs
@@ -21,7 +21,6 @@ pub trait SettlementSimulating: Send + Sync {
 }
 
 pub struct SettlementSimulator {
-    web3: Web3,
     settlement_contract: GPv2Settlement,
     gas_price: GasPrice1559,
     solver_account: Account,
@@ -33,7 +32,6 @@ impl SettlementSimulating for SettlementSimulator {
         let result = simulate_and_estimate_gas_at_current_block(
             std::iter::once((self.solver_account.clone(), settlement, None)),
             &self.settlement_contract,
-            &self.web3,
             self.gas_price,
         )
         .await;
@@ -42,7 +40,6 @@ impl SettlementSimulating for SettlementSimulator {
 }
 
 pub struct PostProcessingPipeline {
-    web3: Web3,
     settlement_contract: GPv2Settlement,
     unwrap_factor: f64,
     weth: WETH9,
@@ -59,10 +56,9 @@ impl PostProcessingPipeline {
         market_makable_token_list: AutoUpdatingTokenList,
     ) -> Self {
         let weth = WETH9::at(&web3, native_token);
-        let buffer_retriever = BufferRetriever::new(web3.clone(), settlement_contract.address());
+        let buffer_retriever = BufferRetriever::new(web3, settlement_contract.address());
 
         Self {
-            web3,
             settlement_contract,
             unwrap_factor,
             weth,
@@ -78,7 +74,6 @@ impl PostProcessingPipeline {
         gas_price: GasPrice1559,
     ) -> Settlement {
         let simulator = SettlementSimulator {
-            web3: self.web3.clone(),
             settlement_contract: self.settlement_contract.clone(),
             gas_price,
             solver_account,
diff --git a/crates/solver/src/settlement_rater.rs b/crates/solver/src/settlement_rater.rs
index fbfaa021ce..6148d88213 100644
--- a/crates/solver/src/settlement_rater.rs
+++ b/crates/solver/src/settlement_rater.rs
@@ -106,7 +106,6 @@ impl SettlementRating for SettlementRater {
                 )
             }),
             &self.settlement_contract,
-            &self.web3,
             gas_price,
         )
         .await
diff --git a/crates/solver/src/settlement_simulation.rs b/crates/solver/src/settlement_simulation.rs
index 3ac4075bcd..067cb4212b 100644
--- a/crates/solver/src/settlement_simulation.rs
+++ b/crates/solver/src/settlement_simulation.rs
@@ -39,34 +39,19 @@ const MAX_BASE_GAS_FEE_INCREASE: f64 = 1.125;
 pub async fn simulate_and_estimate_gas_at_current_block(
     settlements: impl Iterator<Item = (Account, Settlement, Option<AccessList>)>,
     contract: &GPv2Settlement,
-    web3: &Web3,
     gas_price: GasPrice1559,
 ) -> Result<Vec<Result<U256, ExecutionError>>> {
     // Collect into Vec to not rely on Itertools::chunk which would make this future !Send.
     let settlements: Vec<_> = settlements.collect();
 
-    // Needed because sending an empty batch request gets an empty response which doesn't
-    // deserialize correctly.
-    if settlements.is_empty() {
-        return Ok(Vec::new());
-    }
-
-    let web3 = web3::Web3::new(shared::transport::buffered::Buffered::new(
-        web3.transport().clone(),
-    ));
-    let contract_with_buffered_transport = GPv2Settlement::at(&web3, contract.address());
+    // Force settlement simulations to be done in smaller batches. They can be
+    // quite large and exert significant node pressure.
     let mut results = Vec::new();
     for chunk in settlements.chunks(SIMULATE_BATCH_SIZE) {
         let calls = chunk
             .iter()
             .map(|(account, settlement, access_list)| {
-                let tx = settle_method(
-                    gas_price,
-                    &contract_with_buffered_transport,
-                    settlement.clone(),
-                    account.clone(),
-                )
-                .tx;
+                let tx = settle_method(gas_price, contract, settlement.clone(), account.clone()).tx;
                 let tx = match access_list {
                     Some(access_list) => tx.access_list(access_list.clone()),
                     None => tx,
@@ -77,6 +62,7 @@ pub async fn simulate_and_estimate_gas_at_current_block(
         let chuck_results = futures::future::join_all(calls).await;
         results.extend(chuck_results);
     }
+
     Ok(results)
 }
 
@@ -276,7 +262,10 @@ mod tests {
     #[ignore]
     async fn mainnet() {
         // Create some bogus settlements to see that the simulation returns an error.
-        shared::tracing::initialize("solver=debug,shared=debug", tracing::Level::ERROR.into());
+        shared::tracing::initialize(
+            "info,solver=debug,shared=debug,shared::transport=trace",
+            tracing::Level::ERROR.into(),
+        );
         let transport = create_env_test_transport();
         let web3 = Web3::new(transport);
         let block = web3.eth().block_number().await.unwrap().as_u64();
@@ -307,7 +296,6 @@ mod tests {
         let result = simulate_and_estimate_gas_at_current_block(
             settlements.iter().cloned(),
             &contract,
-            &web3,
             Default::default(),
         )
         .await
@@ -317,7 +305,6 @@ mod tests {
         let result = simulate_and_estimate_gas_at_current_block(
             std::iter::empty(),
             &contract,
-            &web3,
             Default::default(),
         )
         .await
@@ -383,6 +370,7 @@ mod tests {
             "sellTokenBalance": "erc20",
             "buyTokenBalance": "erc20",
             "isLiquidityOrder": false,
+            "class": "ordinary",
         });
         let order0: Order = serde_json::from_value(value).unwrap();
         let value = json!(
@@ -414,6 +402,7 @@ mod tests {
             "sellTokenBalance": "erc20",
             "buyTokenBalance": "erc20",
             "isLiquidityOrder": true,
+            "class": "liquidity",
         });
         let order1: Order = serde_json::from_value(value).unwrap();
         let value = json!(
@@ -445,6 +434,7 @@ mod tests {
             "sellTokenBalance": "erc20",
             "buyTokenBalance": "erc20",
             "isLiquidityOrder": false,
+            "class": "ordinary",
         });
         let order2: Order = serde_json::from_value(value).unwrap();
 
@@ -686,7 +676,10 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn mainnet_chunked() {
-        shared::tracing::initialize("solver=debug,shared=debug", tracing::Level::ERROR.into());
+        shared::tracing::initialize(
+            "info,solver=debug,shared=debug,shared::transport=trace",
+            tracing::Level::ERROR.into(),
+        );
         let transport = create_env_test_transport();
         let web3 = Web3::new(transport);
         let contract = GPv2Settlement::deployed(&web3).await.unwrap();
@@ -700,7 +693,6 @@ mod tests {
         let result = simulate_and_estimate_gas_at_current_block(
             settlements.iter().cloned(),
             &contract,
-            &web3,
             GasPrice1559::default(),
         )
         .await
diff --git a/crates/solver/src/settlement_submission/submitter.rs b/crates/solver/src/settlement_submission/submitter.rs
index d301020021..47eaccaf76 100644
--- a/crates/solver/src/settlement_submission/submitter.rs
+++ b/crates/solver/src/settlement_submission/submitter.rs
@@ -687,7 +687,6 @@ mod tests {
             crate::settlement_simulation::simulate_and_estimate_gas_at_current_block(
                 std::iter::once((account.clone(), settlement.clone(), None)),
                 &contract,
-                &web3,
                 Default::default(),
             )
             .await