diff --git a/docs/userguides/transactions.md b/docs/userguides/transactions.md
index 17e9baf6f6..6b3bd9bd45 100644
--- a/docs/userguides/transactions.md
+++ b/docs/userguides/transactions.md
@@ -176,6 +176,7 @@ ethereum:
 
 ## Traces
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 Transaction traces are the steps in the contract the transaction took.
 Traces both power a myriad of features in Ape as well are themselves a tool for developers to use to debug transactions.
@@ -298,6 +299,11 @@ It will output tables of contracts and methods with gas usages that look like th
 │ mint                        1   25845   25845   25845   25845
 ```
 >>>>>>> 49929845d (refactor!: rename geth to node (#1982))
+=======
+Transaction traces are the steps in the contract the transaction took.
+Traces both power a myriad of features in Ape as well are themselves a tool for developers to use to debug transactions.
+To learn more about traces, see the [traces userguide](./trace.md).
+>>>>>>> 8cbef2689 (refactor!: TraceAPI (#1864))
 
 ## Estimate Gas Cost
 
diff --git a/src/ape_ethereum/ecosystem.py b/src/ape_ethereum/ecosystem.py
index 262257898d..676a57c8e2 100644
--- a/src/ape_ethereum/ecosystem.py
+++ b/src/ape_ethereum/ecosystem.py
@@ -1,8 +1,7 @@
 import re
-from collections.abc import Iterator, Sequence
 from decimal import Decimal
 from functools import cached_property
-from typing import Any, ClassVar, Optional, Union, cast
+from typing import Any, ClassVar, Iterator, Optional, Sequence, Union, cast
 
 from eth_abi import decode, encode
 from eth_abi.exceptions import InsufficientDataBytes, NonEmptyPaddingBytes
diff --git a/src/ape_ethereum/provider.py b/src/ape_ethereum/provider.py
index 17174ee4d9..cf54a529d4 100644
--- a/src/ape_ethereum/provider.py
+++ b/src/ape_ethereum/provider.py
@@ -482,7 +482,7 @@ def _eth_call(self, arguments: list) -> HexBytes:
         return HexBytes(result)
 
     def _prepare_call(self, txn: Union[dict, TransactionAPI], **kwargs) -> list:
-        # NOTE: Using mode="json" because used as request data.
+        # NOTE: Using mode="json" because used in request data.
         txn_dict = (
             txn.model_dump(by_alias=True, mode="json") if isinstance(txn, TransactionAPI) else txn
         )
@@ -850,7 +850,6 @@ def fetch_log_page(block_range):
 
             # NOTE: Using JSON mode since used as request data.
             filter_params = page_filter.model_dump(mode="json")
-
             logs = self.make_request("eth_getLogs", [filter_params])
             return self.network.ecosystem.decode_logs(logs, *log_filter.events)
 
@@ -1147,9 +1146,6 @@ class EthereumNodeProvider(Web3Provider, ABC):
 
     name: str = "node"
 
-    """Is ``None`` until known."""
-    can_use_parity_traces: Optional[bool] = None
-
     @property
     def uri(self) -> str:
         if "url" in self.provider_settings:
diff --git a/tests/functional/geth/test_provider.py b/tests/functional/geth/test_provider.py
index 3104c7798d..e1afd69998 100644
--- a/tests/functional/geth/test_provider.py
+++ b/tests/functional/geth/test_provider.py
@@ -106,15 +106,6 @@ def test_repr_on_live_network_and_disconnected(networks):
     assert actual == expected
 
 
-@geth_process_test
-def test_get_logs(geth_contract, geth_account):
-    geth_contract.setNumber(101010, sender=geth_account)
-    actual = geth_contract.NumberChange[-1]
-    assert actual.event_name == "NumberChange"
-    assert actual.contract_address == geth_contract.address
-    assert actual.event_arguments["newNum"] == 101010
-
-
 @geth_process_test
 def test_chain_id_when_connected(geth_provider):
     assert geth_provider.chain_id == 1337