diff --git a/src/base/bittorrent/torrentimpl.cpp b/src/base/bittorrent/torrentimpl.cpp
index 8ecd1e98a..6fb3e72bd 100644
--- a/src/base/bittorrent/torrentimpl.cpp
+++ b/src/base/bittorrent/torrentimpl.cpp
@@ -31,7 +31,6 @@
 
 #include <algorithm>
 #include <memory>
-#include <type_traits>
 
 #include <libtorrent/address.hpp>
 #include <libtorrent/alert_types.hpp>
@@ -551,8 +550,7 @@ QVector<TrackerEntry> TorrentImpl::trackers() const
 
 void TorrentImpl::addTrackers(QVector<TrackerEntry> trackers)
 {
-    // TODO: use std::erase_if() in C++20
-    trackers.erase(std::remove_if(trackers.begin(), trackers.end(), [](const TrackerEntry &entry) { return entry.url.isEmpty(); }), trackers.end());
+    trackers.removeIf([](const TrackerEntry &entry) { return entry.url.isEmpty(); });
 
     const auto newTrackers = QSet<TrackerEntry>(trackers.cbegin(), trackers.cend())
             - QSet<TrackerEntry>(m_trackerEntries.cbegin(), m_trackerEntries.cend());
@@ -596,8 +594,7 @@ void TorrentImpl::removeTrackers(const QStringList &trackers)
 
 void TorrentImpl::replaceTrackers(QVector<TrackerEntry> trackers)
 {
-    // TODO: use std::erase_if() in C++20
-    trackers.erase(std::remove_if(trackers.begin(), trackers.end(), [](const TrackerEntry &entry) { return entry.url.isEmpty(); }), trackers.end());
+    trackers.removeIf([](const TrackerEntry &entry) { return entry.url.isEmpty(); });
     std::sort(trackers.begin(), trackers.end()
         , [](const TrackerEntry &lhs, const TrackerEntry &rhs) { return lhs.tier < rhs.tier; });
 
diff --git a/src/base/net/downloadmanager.cpp b/src/base/net/downloadmanager.cpp
index 55192ec60..6a955f26b 100644
--- a/src/base/net/downloadmanager.cpp
+++ b/src/base/net/downloadmanager.cpp
@@ -42,7 +42,6 @@
 #include <QSslError>
 #include <QUrl>
 
-#include "base/algorithm.h"
 #include "base/global.h"
 #include "base/logger.h"
 #include "base/preferences.h"
@@ -63,7 +62,7 @@ public:
     {
         const QDateTime now = QDateTime::currentDateTime();
         QList<QNetworkCookie> cookies = Preferences::instance()->getNetworkCookies();
-        Algorithm::removeIf(cookies, [&now](const QNetworkCookie &cookie)
+        cookies.removeIf([&now](const QNetworkCookie &cookie)
         {
             return cookie.isSessionCookie() || (cookie.expirationDate() <= now);
         });
@@ -75,7 +74,7 @@ public:
     {
         const QDateTime now = QDateTime::currentDateTime();
         QList<QNetworkCookie> cookies = allCookies();
-        Algorithm::removeIf(cookies, [&now](const QNetworkCookie &cookie)
+        cookies.removeIf([&now](const QNetworkCookie &cookie)
         {
             return cookie.isSessionCookie() || (cookie.expirationDate() <= now);
         });
@@ -90,7 +89,7 @@ public:
     {
         const QDateTime now = QDateTime::currentDateTime();
         QList<QNetworkCookie> cookies = QNetworkCookieJar::cookiesForUrl(url);
-        Algorithm::removeIf(cookies, [&now](const QNetworkCookie &cookie)
+        cookies.removeIf([&now](const QNetworkCookie &cookie)
         {
             return !cookie.isSessionCookie() && (cookie.expirationDate() <= now);
         });
@@ -102,7 +101,7 @@ public:
     {
         const QDateTime now = QDateTime::currentDateTime();
         QList<QNetworkCookie> cookies = cookieList;
-        Algorithm::removeIf(cookies, [&now](const QNetworkCookie &cookie)
+        cookies.removeIf([&now](const QNetworkCookie &cookie)
         {
             return !cookie.isSessionCookie() && (cookie.expirationDate() <= now);
         });
diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
index fe5addf6e..809826faa 100644
--- a/src/base/preferences.cpp
+++ b/src/base/preferences.cpp
@@ -702,7 +702,7 @@ QVector<Utils::Net::Subnet> Preferences::getWebUiAuthSubnetWhitelist() const
 
 void Preferences::setWebUiAuthSubnetWhitelist(QStringList subnets)
 {
-    Algorithm::removeIf(subnets, [](const QString &subnet)
+    subnets.removeIf([](const QString &subnet)
     {
         return !Utils::Net::parseSubnet(subnet.trimmed()).has_value();
     });