diff --git a/src/client/Client.js b/src/client/Client.js
index b6b66b8f5..feac80fd8 100644
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -379,12 +379,9 @@ class Client extends EventEmitter {
       if (!channel.messages) continue;
       channels++;
 
-      for (const message of channel.messages.values()) {
-        if (now - (message.editedTimestamp || message.createdTimestamp) > lifetimeMs) {
-          channel.messages.delete(message.id);
-          messages++;
-        }
-      }
+      messages += channel.messages.sweep(
+        message => now - (message.editedTimestamp || message.createdTimestamp) > lifetimeMs
+      );
     }
 
     this.emit('debug', `Swept ${messages} messages older than ${lifetime} seconds in ${channels} text-based channels`);
diff --git a/src/util/Collection.js b/src/util/Collection.js
index 5776f660f..89add2840 100644
--- a/src/util/Collection.js
+++ b/src/util/Collection.js
@@ -255,6 +255,21 @@ class Collection extends Map {
     return Boolean(this.find(prop, value));
   }
 
+  /**
+   * Removes entries that satisfy the provided filter function.
+   * @param {Function} fn Function used to test (should return a boolean)
+   * @param {Object} [thisArg] Value to use as `this` when executing function
+   * @returns {number} The number of removed entries
+   */
+  sweep(fn, thisArg) {
+    if (thisArg) fn = fn.bind(thisArg);
+    const previousSize = this.size;
+    for (const [key, val] of this) {
+      if (fn(val, key, this)) this.delete(key);
+    }
+    return previousSize - this.size;
+  }
+
   /**
    * Identical to
    * [Array.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter),