diff --git a/server/src/main/java/com/objectcomputing/checkins/services/file/FileServicesImpl.java b/server/src/main/java/com/objectcomputing/checkins/services/file/FileServicesImpl.java
index 7653f0d715..43883ba2c7 100644
--- a/server/src/main/java/com/objectcomputing/checkins/services/file/FileServicesImpl.java
+++ b/server/src/main/java/com/objectcomputing/checkins/services/file/FileServicesImpl.java
@@ -74,7 +74,7 @@ public Set<FileInfoDTO> findFiles(@Nullable UUID checkInID) {
 
             if (checkInID == null && isAdmin) {
                 FileList driveIndex = getFoldersInRoot(drive, rootDirId);
-                driveIndex.getFiles().stream().forEach(folder -> {
+                driveIndex.getFiles().forEach(folder -> {
                     try {
                         //find all
                         FileList fileList = drive.files().list().setSupportsAllDrives(true)
@@ -83,7 +83,7 @@ public Set<FileInfoDTO> findFiles(@Nullable UUID checkInID) {
                                 .setSpaces("drive")
                                 .setFields("files(id, name, parents, size)")
                                 .execute();
-                        fileList.getFiles().stream()
+                        fileList.getFiles()
                                 .forEach(file -> result.add(setFileInfo(file, null)));
                     } catch (IOException ioe) {
                         LOG.error("Error occurred while retrieving files from Google Drive.", ioe);
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/guild/GuildServicesImpl.java b/server/src/main/java/com/objectcomputing/checkins/services/guild/GuildServicesImpl.java
index 522d86942d..8f3757d26e 100644
--- a/server/src/main/java/com/objectcomputing/checkins/services/guild/GuildServicesImpl.java
+++ b/server/src/main/java/com/objectcomputing/checkins/services/guild/GuildServicesImpl.java
@@ -174,7 +174,7 @@ public GuildResponseDTO update(GuildUpdateDTO guildDTO) {
                     Set<GuildMember> existingGuildMembers = guildMemberServices.findByFields(guildDTO.getId(), null, null);
                   
                     //add new members to the guild
-                    guildDTO.getGuildMembers().stream().forEach(updatedMember -> {
+                    guildDTO.getGuildMembers().forEach(updatedMember -> {
                         Optional<GuildMember> first = existingGuildMembers.stream().filter(existing -> existing.getMemberId().equals(updatedMember.getMemberId())).findFirst();
                         MemberProfile existingMember = memberProfileServices.getById(updatedMember.getMemberId());
                         if(first.isEmpty()) {
@@ -186,7 +186,7 @@ public GuildResponseDTO update(GuildUpdateDTO guildDTO) {
                     });
 
                     //delete any removed members from guild
-                    existingGuildMembers.stream().forEach(existingMember -> {
+                    existingGuildMembers.forEach(existingMember -> {
                         if(!guildDTO.getGuildMembers().stream().filter(updatedTeamMember -> updatedTeamMember.getMemberId().equals(existingMember.getMemberId())).findFirst().isPresent()) {
                             guildMemberServices.delete(existingMember.getId());
                             removedMembers.add(memberProfileServices.getById(existingMember.getMemberId()));
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/team/TeamServicesImpl.java b/server/src/main/java/com/objectcomputing/checkins/services/team/TeamServicesImpl.java
index 3d42cac850..cca0920f42 100644
--- a/server/src/main/java/com/objectcomputing/checkins/services/team/TeamServicesImpl.java
+++ b/server/src/main/java/com/objectcomputing/checkins/services/team/TeamServicesImpl.java
@@ -102,7 +102,7 @@ public TeamResponseDTO update(TeamUpdateDTO teamDTO) {
 
                     Set<TeamMember> existingTeamMembers = teamMemberServices.findByFields(teamDTO.getId(), null, null);
                     //add any new members & updates
-                    teamDTO.getTeamMembers().stream().forEach(updatedMember -> {
+                    teamDTO.getTeamMembers().forEach(updatedMember -> {
                         Optional<TeamMember> first = existingTeamMembers.stream().filter(existing -> existing.getMemberId().equals(updatedMember.getMemberId())).findFirst();
                         if (first.isEmpty()) {
                             MemberProfile existingMember = memberProfileServices.getById(updatedMember.getMemberId());
@@ -114,7 +114,7 @@ public TeamResponseDTO update(TeamUpdateDTO teamDTO) {
                     });
 
                     //delete any removed members
-                    existingTeamMembers.stream().forEach(existingMember -> {
+                    existingTeamMembers.forEach(existingMember -> {
                         if (!teamDTO.getTeamMembers().stream().filter(updatedTeamMember -> updatedTeamMember.getMemberId().equals(existingMember.getMemberId())).findFirst().isPresent()) {
                             teamMemberServices.delete(existingMember.getId());
                         }