diff --git a/howto/create-a-full-peer-to-peer-filesystem-with-hyperdrive.md b/howto/create-a-full-peer-to-peer-filesystem-with-hyperdrive.md
index b1b16ff..25777ba 100644
--- a/howto/create-a-full-peer-to-peer-filesystem-with-hyperdrive.md
+++ b/howto/create-a-full-peer-to-peer-filesystem-with-hyperdrive.md
@@ -128,11 +128,8 @@ const mirror = debounce(mirrorDrive)
 // to the Hypercore instance of the hyperdrive
 drive.core.on('append', mirror)
 
-const foundPeers = store.findingPeers()
-
 // join a topic
 swarm.join(drive.discoveryKey, { client: true, server: false })
-swarm.flush().then(() => foundPeers())
 
 // start the mirroring process (i.e copying the contents from remote drive to local dir)
 mirror()
@@ -198,9 +195,8 @@ const bee = new Hyperbee(core, {
 // wait till the properties of the hypercore instance are initialized
 await core.ready()
 
-const foundPeers = store.findingPeers()
 swarm.join(core.discoveryKey)
-swarm.flush().then(() => foundPeers())
+await swarm.flush()
 
 // execute the listBee function whenever the data is appended to the underlying hypercore
 core.on('append', listBee)
diff --git a/howto/replicate-and-persist-with-hypercore.md b/howto/replicate-and-persist-with-hypercore.md
index 78d0543..8477b62 100644
--- a/howto/replicate-and-persist-with-hypercore.md
+++ b/howto/replicate-and-persist-with-hypercore.md
@@ -78,18 +78,12 @@ Pear.teardown(() => swarm.destroy())
 const core = new Hypercore(path.join(Pear.config.storage, 'reader-storage'), Pear.config.args[0])
 await core.ready()
 
-const foundPeers = core.findingPeers()
 swarm.join(core.discoveryKey)
 swarm.on('connection', conn => core.replicate(conn))
 
 // swarm.flush() will wait until *all* discoverable peers have been connected to
-// It might take a while, so don't await it
-// Instead, use core.findingPeers() to mark when the discovery process is completed
-swarm.flush().then(() => foundPeers())
+await swarm.flush()
 
-// This won't resolve until either
-//    a) the first peer is found
-// or b) no peers could be found
 await core.update()
 
 let position = core.length
diff --git a/howto/share-append-only-databases-with-hyperbee.md b/howto/share-append-only-databases-with-hyperbee.md
index f7844f8..70f6767 100644
--- a/howto/share-append-only-databases-with-hyperbee.md
+++ b/howto/share-append-only-databases-with-hyperbee.md
@@ -192,10 +192,9 @@ const core = store.get({ key: b4a.from(key, 'hex') })
 // wait till the properties of the hypercore instance are initialized
 await core.ready()
 
-const foundPeers = store.findingPeers()
 // join a topic
 swarm.join(core.discoveryKey)
-swarm.flush().then(() => foundPeers())
+await swarm.flush()
 
 // update the meta-data information of the hypercore instance
 await core.update()
diff --git a/howto/work-with-many-hypercores-using-corestore.md b/howto/work-with-many-hypercores-using-corestore.md
index 288b5f3..4be0b3e 100644
--- a/howto/work-with-many-hypercores-using-corestore.md
+++ b/howto/work-with-many-hypercores-using-corestore.md
@@ -100,9 +100,8 @@ const core = store.get({ key, valueEncoding: 'json' })
 // wait till all the properties of the hypercore instance are initialized
 await core.ready()
 
-const foundPeers = core.findingPeers()
 swarm.join(core.discoveryKey)
-swarm.flush().then(() => foundPeers())
+await swarm.flush()
 
 // update the meta-data of the hypercore instance
 await core.update()