diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java
index 13cf83a4..9c055f87 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java
@@ -275,13 +275,7 @@ public class PlayQueueService {
         }
 
         // Remove non-present files
-        Iterator<MediaFile> iterator = files.iterator();
-        while (iterator.hasNext()) {
-            MediaFile file = iterator.next();
-            if (!file.isPresent()) {
-                iterator.remove();
-            }
-        }
+        files.removeIf(file -> !file.isPresent());
         Player player = getCurrentPlayer(request, response);
         return doPlay(request, player, files).setStartPlayerAt(0);
     }
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
index 0030e8da..b8c93d4d 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
@@ -356,13 +356,7 @@ public class MediaFileService {
      * Removes video files from the given list.
      */
     public void removeVideoFiles(List<MediaFile> files) {
-        Iterator<MediaFile> iterator = files.iterator();
-        while (iterator.hasNext()) {
-            MediaFile file = iterator.next();
-            if (file.isVideo()) {
-                iterator.remove();
-            }
-        }
+        files.removeIf(MediaFile::isVideo);
     }
 
     public Date getMediaFileStarredDate(int id, String username) {
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java b/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java
index 556f7371..ae15139e 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java
@@ -131,13 +131,7 @@ public class StatusService {
     }
 
     public synchronized void addRemotePlay(PlayStatus playStatus) {
-        Iterator<PlayStatus> iterator = remotePlays.iterator();
-        while (iterator.hasNext()) {
-            PlayStatus rp = iterator.next();
-            if (rp.isExpired()) {
-                iterator.remove();
-            }
-        }
+        remotePlays.removeIf(PlayStatus::isExpired);
         remotePlays.add(playStatus);
     }
 
diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java b/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java
index b4030541..37066dee 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java
@@ -65,12 +65,6 @@ public class SpringLiquibase extends liquibase.integration.spring.SpringLiquibas
     }
 
     private void removeCurrentHsqlDb(List<Database> implementedDatabases) {
-        Iterator<Database> iterator = implementedDatabases.iterator();
-        while (iterator.hasNext()) {
-            Database db = iterator.next();
-            if (db instanceof liquibase.database.core.HsqlDatabase) {
-                iterator.remove();
-            }
-        }
+        implementedDatabases.removeIf(db -> db instanceof liquibase.database.core.HsqlDatabase);
     }
 }