diff --git a/codex/blockexchange/engine/advertiser.nim b/codex/blockexchange/engine/advertiser.nim
index 5ff82e48..20baaf58 100644
--- a/codex/blockexchange/engine/advertiser.nim
+++ b/codex/blockexchange/engine/advertiser.nim
@@ -137,10 +137,12 @@ proc start*(b: Advertiser) {.async.} =
 
   b.advertiserRunning = true
   for i in 0..<b.concurrentAdvReqs:
-    let fut = b.processQueueLoop().track(b)
+    let fut = b.processQueueLoop()
+    b.trackedFutures.track(fut)
     asyncSpawn fut
 
-  b.advertiseLocalStoreLoop = advertiseLocalStoreLoop(b).track(b)
+  b.advertiseLocalStoreLoop = advertiseLocalStoreLoop(b)
+  b.trackedFutures.track(b.advertiseLocalStoreLoop)
   asyncSpawn b.advertiseLocalStoreLoop
 
 proc stop*(b: Advertiser) {.async.} =
diff --git a/codex/blockexchange/engine/discovery.nim b/codex/blockexchange/engine/discovery.nim
index 50a5c8b9..16ef560b 100644
--- a/codex/blockexchange/engine/discovery.nim
+++ b/codex/blockexchange/engine/discovery.nim
@@ -147,10 +147,12 @@ proc start*(b: DiscoveryEngine) {.async.} =
 
   b.discEngineRunning = true
   for i in 0..<b.concurrentDiscReqs:
-    let fut = b.discoveryTaskLoop().track(b)
+    let fut = b.discoveryTaskLoop()
+    b.trackedFutures.track(fut)
     asyncSpawn fut
 
-  b.discoveryLoop = b.discoveryQueueLoop().track(b)
+  b.discoveryLoop = b.discoveryQueueLoop()
+  b.trackedFutures.track(b.discoveryLoop)
   asyncSpawn b.discoveryLoop
 
 proc stop*(b: DiscoveryEngine) {.async.} =
diff --git a/codex/blockexchange/engine/engine.nim b/codex/blockexchange/engine/engine.nim
index 3ec03df8..4ed2ad78 100644
--- a/codex/blockexchange/engine/engine.nim
+++ b/codex/blockexchange/engine/engine.nim
@@ -106,7 +106,8 @@ proc start*(b: BlockExcEngine) {.async.} =
 
   b.blockexcRunning = true
   for i in 0..<b.concurrentTasks:
-    let fut = b.blockexcTaskRunner().track(b)
+    let fut = b.blockexcTaskRunner()
+    b.trackedFutures.track(fut)
     asyncSpawn fut
 
 proc stop*(b: BlockExcEngine) {.async.} =
diff --git a/codex/sales.nim b/codex/sales.nim
index 6cfef4cf..f891edab 100644
--- a/codex/sales.nim
+++ b/codex/sales.nim
@@ -351,7 +351,9 @@ proc onSlotFreed(sales: Sales,
     if err =? queue.push(found).errorOption:
       error "failed to push slot items to queue", error = err.msgDetail
 
-  asyncSpawn addSlotToQueue().track(sales)
+  let fut = addSlotToQueue()
+  sales.trackedFutures.track(fut)
+  asyncSpawn fut
 
 proc subscribeRequested(sales: Sales) {.async.} =
   let context = sales.context
diff --git a/codex/sales/slotqueue.nim b/codex/sales/slotqueue.nim
index f565d276..f5685e34 100644
--- a/codex/sales/slotqueue.nim
+++ b/codex/sales/slotqueue.nim
@@ -323,7 +323,7 @@ proc addWorker(self: SlotQueue): ?!void =
 
   let worker = SlotQueueWorker.init()
   try:
-    discard worker.doneProcessing.track(self)
+    self.trackedFutures.track(worker.doneProcessing)
     self.workers.addLastNoWait(worker)
   except AsyncQueueFullError:
     return failure("failed to add worker, worker queue full")
@@ -343,7 +343,7 @@ proc dispatch(self: SlotQueue,
 
   if onProcessSlot =? self.onProcessSlot:
     try:
-      discard worker.doneProcessing.track(self)
+      self.trackedFutures.track(worker.doneProcessing)
       await onProcessSlot(item, worker.doneProcessing)
       await worker.doneProcessing
 
@@ -418,7 +418,9 @@ proc run(self: SlotQueue) {.async: (raises: []).} =
 
       trace "processing item"
 
-      asyncSpawn self.dispatch(worker, item).track(self)
+      let fut = self.dispatch(worker, item)
+      self.trackedFutures.track(fut)
+      asyncSpawn fut
 
       await sleepAsync(1.millis) # poll
     except CancelledError:
@@ -444,7 +446,9 @@ proc start*(self: SlotQueue) =
     if err =? self.addWorker().errorOption:
       error "start: error adding new worker", error = err.msg
 
-  asyncSpawn self.run().track(self)
+  let fut = self.run()
+  self.trackedFutures.track(fut)
+  asyncSpawn fut
 
 proc stop*(self: SlotQueue) {.async.} =
   if not self.running:
diff --git a/codex/utils/asyncstatemachine.nim b/codex/utils/asyncstatemachine.nim
index cb6ba51b..f64d8220 100644
--- a/codex/utils/asyncstatemachine.nim
+++ b/codex/utils/asyncstatemachine.nim
@@ -78,7 +78,8 @@ proc scheduler(machine: Machine) {.async: (raises: []).} =
         machine.state = next
         debug "enter state", state = fromState & " => " & $machine.state
         running = machine.run(machine.state)
-        asyncSpawn running.track(machine)
+        machine.trackedFutures.track(running)
+        asyncSpawn running
     except CancelledError:
       break # do not propagate bc it is asyncSpawned
 
@@ -90,7 +91,9 @@ proc start*(machine: Machine, initialState: State) =
     machine.scheduled = newAsyncQueue[Event]()
 
   machine.started = true
-  asyncSpawn machine.scheduler().track(machine)
+  let fut = machine.scheduler()
+  machine.trackedFutures.track(fut)
+  asyncSpawn fut
   machine.schedule(Event.transition(machine.state, initialState))
 
 proc stop*(machine: Machine) {.async.} =
diff --git a/codex/utils/trackedfutures.nim b/codex/utils/trackedfutures.nim
index a9753299..2505ffe2 100644
--- a/codex/utils/trackedfutures.nim
+++ b/codex/utils/trackedfutures.nim
@@ -19,9 +19,9 @@ proc removeFuture(self: TrackedFutures, future: FutureBase) =
   if not self.cancelling and not future.isNil:
     self.futures.del(future.id)
 
-proc track*[T](self: TrackedFutures, fut: Future[T]): Future[T] =
+proc track*[T](self: TrackedFutures, fut: Future[T]) =
   if self.cancelling:
-    return fut
+    return
 
   self.futures[fut.id] = FutureBase(fut)
 
@@ -30,14 +30,6 @@ proc track*[T](self: TrackedFutures, fut: Future[T]): Future[T] =
 
   fut.addCallback(cb)
 
-  return fut
-
-proc track*[T, U](future: Future[T], self: U): Future[T] =
-  ## Convenience method that allows chaining future, eg:
-  ## `await someFut().track(sales)`, where `sales` has declared a
-  ## `trackedFutures` property.
-  self.trackedFutures.track(future)
-
 proc cancelTracked*(self: TrackedFutures) {.async: (raises: []).} =
   self.cancelling = true
 
diff --git a/tests/codex/utils/testtrackedfutures.nim b/tests/codex/utils/testtrackedfutures.nim
index 9274f84f..cbabd39c 100644
--- a/tests/codex/utils/testtrackedfutures.nim
+++ b/tests/codex/utils/testtrackedfutures.nim
@@ -18,36 +18,36 @@ asyncchecksuite "tracked futures":
 
   test "tracks unfinished futures":
     let fut = newFuture[void]("test")
-    discard fut.track(module)
+    module.trackedFutures.track(fut)
     check module.trackedFutures.len == 1
 
   test "does not track completed futures":
     let fut = newFuture[void]("test")
     fut.complete()
-    discard fut.track(module)
+    module.trackedFutures.track(fut)
     check eventually module.trackedFutures.len == 0
 
   test "does not track failed futures":
     let fut = newFuture[void]("test")
     fut.fail((ref CatchableError)(msg: "some error"))
-    discard fut.track(module)
+    module.trackedFutures.track(fut)
     check eventually module.trackedFutures.len == 0
 
   test "does not track cancelled futures":
     let fut = newFuture[void]("test")
     await fut.cancelAndWait()
-    discard fut.track(module)
+    module.trackedFutures.track(fut)
     check eventually module.trackedFutures.len == 0
 
   test "removes tracked future when finished":
     let fut = newFuture[void]("test")
-    discard fut.track(module)
+    module.trackedFutures.track(fut)
     fut.complete()
     check eventually module.trackedFutures.len == 0
 
   test "removes tracked future when cancelled":
     let fut = newFuture[void]("test")
-    discard fut.track(module)
+    module.trackedFutures.track(fut)
     await fut.cancelAndWait()
     check eventually module.trackedFutures.len == 0
 
@@ -55,9 +55,9 @@ asyncchecksuite "tracked futures":
     let fut1 = newFuture[void]("test1")
     let fut2 = newFuture[void]("test2")
     let fut3 = newFuture[void]("test3")
-    discard fut1.track(module)
-    discard fut2.track(module)
-    discard fut3.track(module)
+    module.trackedFutures.track(fut1)
+    module.trackedFutures.track(fut2)
+    module.trackedFutures.track(fut3)
     await module.trackedFutures.cancelTracked()
     check eventually fut1.cancelled
     check eventually fut2.cancelled
diff --git a/tests/integration/nodeprocess.nim b/tests/integration/nodeprocess.nim
index c762926d..88613d2e 100644
--- a/tests/integration/nodeprocess.nim
+++ b/tests/integration/nodeprocess.nim
@@ -157,10 +157,11 @@ proc waitUntilOutput*(node: NodeProcess, output: string) {.async.} =
   trace "waiting until", output
 
   let started = newFuture[void]()
-  let fut = node.captureOutput(output, started).track(node)
+  let fut = node.captureOutput(output, started)
+  node.trackedFutures.track(fut)
   asyncSpawn fut
   await started.wait(60.seconds) # allow enough time for proof generation
-  
+
 proc waitUntilStarted*(node: NodeProcess) {.async.} =
   try:
     await node.waitUntilOutput(node.startedOutput)