Revert "Improve memory management in user and batch processing"

This reverts commit f8670f8.

Author: JohnDuprey

Modules/CIPPCore/Public/Add-CIPPAzDataTableEntity.ps1

@@ -65,11 +65,11 @@ function Add-CIPPAzDataTableEntity {
             try {
                 # Ensure all property values are not null for string properties
                 if ($SingleEnt -is [hashtable]) {
-                    $keysToRemove = @($SingleEnt.Keys | Where-Object { $null -eq $SingleEnt[$_] })
-                    foreach ($key in $keysToRemove) {
-                        $SingleEnt.Remove($key)
+                    foreach ($key in @($SingleEnt.Keys)) {
+                        if ($null -eq $SingleEnt[$key]) {
+                            $SingleEnt.Remove($key)
+                        }
                     }
-                    $keysToRemove = $null
                 } elseif ($SingleEnt -is [PSCustomObject]) {
                     $propsToRemove = [system.Collections.Generic.List[string]]::new()
                     foreach ($prop in $SingleEnt.PSObject.Properties) {

Modules/CIPPCore/Public/Add-CIPPDbItem.ps1

@@ -110,20 +110,7 @@ function Add-CIPPDbItem {
                 # Clear batch variables to free memory
                 $Entities = $null
                 $Batch = $null
-
-                # Capture memory before GC
-                $MemoryBeforeGC = [System.GC]::GetTotalMemory($false)
-
-                # Force GC between batches to prevent accumulation
-                [System.GC]::Collect([System.GC]::MaxGeneration, [System.GCCollectionMode]::Forced)
-                [System.GC]::WaitForPendingFinalizers()
-                [System.GC]::Collect([System.GC]::MaxGeneration, [System.GCCollectionMode]::Forced)
-
-                # Log memory usage after GC
-                $MemoryAfterGC = [System.GC]::GetTotalMemory($false)
-                $FreedMB = [math]::Round(($MemoryBeforeGC - $MemoryAfterGC) / 1MB, 2)
-                $CurrentMemoryMB = [math]::Round($MemoryAfterGC / 1MB, 2)
-                Write-Information "Batch $([Math]::Ceiling($ProcessedCount / $BatchSize))/$([Math]::Ceiling($TotalCount / $BatchSize)) complete. Processed: $ProcessedCount/$TotalCount | Memory: ${CurrentMemoryMB}MB | Freed: ${FreedMB}MB"
+                [System.GC]::Collect()
             }
 
         }

Modules/CIPPCore/Public/Set-CIPPDBCacheUsers.ps1

@@ -32,12 +32,6 @@ function Set-CIPPDBCacheUsers {
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached users successfully' -sev Debug
 
     } catch {
-        # Cleanup on error to prevent memory leak
-        if ($null -ne $Users) { 
-            $Users.Clear()
-            $Users = $null
-        }
-        $UsersResponse = $null
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Failed to cache users: $($_.Exception.Message)" -sev Error -LogData (Get-CippException -Exception $_)
     }
 }