diff --git a/beacon_chain/attestation_pool.nim b/beacon_chain/attestation_pool.nim
index cf9c19b96..a809e6a97 100644
--- a/beacon_chain/attestation_pool.nim
+++ b/beacon_chain/attestation_pool.nim
@@ -11,8 +11,7 @@ import
   deques, sequtils, tables, options,
   chronicles, stew/[byteutils], json_serialization/std/sets,
   ./spec/[beaconstate, datatypes, crypto, digest, helpers, validator],
-  ./extras, ./block_pool, ./block_pools/candidate_chains, ./beacon_node_types,
-  ./fork_choice/[fork_choice_types, fork_choice]
+  ./extras, ./block_pool, ./block_pools/candidate_chains, ./beacon_node_types
 
 logScope: topics = "attpool"
 
diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim
index f9a69c497..4ad9b89e6 100644
--- a/beacon_chain/beacon_node.nim
+++ b/beacon_chain/beacon_node.nim
@@ -721,7 +721,7 @@ proc installAttestationHandlers(node: BeaconNode) =
     let (afterGenesis, slot) = node.beaconClock.now().toSlot()
     if not afterGenesis:
       return false
-    node.attestationPool.isValidAttestation(attestation, slot, committeeIndex, {})
+    node.attestationPool.isValidAttestation(attestation, slot, committeeIndex)
 
   var attestationSubscriptions: seq[Future[void]] = @[]
 
@@ -734,6 +734,7 @@ proc installAttestationHandlers(node: BeaconNode) =
         # This proc needs to be within closureScope; don't lift out of loop.
         proc(attestation: Attestation): bool =
           attestationValidator(attestation, ci)
+      ))
 
   when ETH2_SPEC == "v0.11.3":
     # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/p2p-interface.md#interop-3
@@ -743,6 +744,7 @@ proc installAttestationHandlers(node: BeaconNode) =
         # isValidAttestation checks attestation.data.index == topicCommitteeIndex
         # which doesn't make sense here, so rig that check to vacuously pass.
         attestationValidator(attestation, attestation.data.index)
+    ))
 
   waitFor allFutures(attestationSubscriptions)
 
diff --git a/beacon_chain/beacon_node_types.nim b/beacon_chain/beacon_node_types.nim
index 119f6e024..4015c3d60 100644
--- a/beacon_chain/beacon_node_types.nim
+++ b/beacon_chain/beacon_node_types.nim
@@ -5,8 +5,7 @@ import
   stew/endians2,
   spec/[datatypes, crypto, digest],
   block_pools/block_pools_types,
-  block_pool, # TODO: refactoring compat shim
-  fork_choice/fork_choice_types
+  block_pool # TODO: refactoring compat shim
 
 export block_pools_types