diff --git a/OpenNest.Engine/NestEngineBase.cs b/OpenNest.Engine/NestEngineBase.cs
index b7fe994..9315f9e 100644
--- a/OpenNest.Engine/NestEngineBase.cs
+++ b/OpenNest.Engine/NestEngineBase.cs
@@ -1,5 +1,4 @@
 using OpenNest.Engine.Fill;
-using OpenNest.Engine.Nfp;
 using OpenNest.Geometry;
 using System;
 using System.Collections.Generic;
@@ -130,9 +129,6 @@ namespace OpenNest
             // Compact placed parts toward the origin to close gaps.
             Compactor.Settle(allParts, Plate.WorkArea(), Plate.PartSpacing);
 
-            // NFP optimization pass — re-place parts using geometry-aware BLF.
-            allParts = AutoNester.Optimize(allParts, Plate);
-
             return allParts;
         }
 
diff --git a/OpenNest.Engine/NfpNestEngine.cs b/OpenNest.Engine/NfpNestEngine.cs
index 9617820..52ce97d 100644
--- a/OpenNest.Engine/NfpNestEngine.cs
+++ b/OpenNest.Engine/NfpNestEngine.cs
@@ -49,9 +49,6 @@ namespace OpenNest
             // Compact placed parts toward the origin to close gaps.
             Compactor.Settle(parts, Plate.WorkArea(), Plate.PartSpacing);
 
-            // NFP optimization pass — re-place parts using geometry-aware BLF.
-            parts = AutoNester.Optimize(parts, Plate);
-
             // Deduct placed quantities from original items.
             foreach (var item in items)
             {
diff --git a/OpenNest.Engine/StripNestEngine.cs b/OpenNest.Engine/StripNestEngine.cs
index fae659d..f580c4c 100644
--- a/OpenNest.Engine/StripNestEngine.cs
+++ b/OpenNest.Engine/StripNestEngine.cs
@@ -1,5 +1,4 @@
 using OpenNest.Engine.Fill;
-using OpenNest.Engine.Nfp;
 using OpenNest.Geometry;
 using System;
 using System.Collections.Generic;
@@ -123,9 +122,6 @@ namespace OpenNest
                 }
             }
 
-            // NFP optimization pass — re-place parts using geometry-aware BLF.
-            allParts = AutoNester.Optimize(allParts, Plate);
-
             // Deduct placed quantities from original items.
             foreach (var item in items)
             {
diff --git a/OpenNest/Controls/PlateView.cs b/OpenNest/Controls/PlateView.cs
index 7b9945b..ea68990 100644
--- a/OpenNest/Controls/PlateView.cs
+++ b/OpenNest/Controls/PlateView.cs
@@ -2,7 +2,6 @@
 using OpenNest.CNC;
 using OpenNest.Collections;
 using OpenNest.Engine.Fill;
-using OpenNest.Engine.Nfp;
 using OpenNest.Forms;
 using OpenNest.Geometry;
 using OpenNest.Math;
@@ -961,7 +960,7 @@ namespace OpenNest.Controls
                 {
                     var result = engine.Fill(groupParts, workArea, progress, cts.Token);
                     Compactor.Settle(result, workArea, spacing);
-                    return AutoNester.Optimize(result, workArea, spacing);
+                    return result;
                 });
 
                 if (parts.Count > 0 && (!cts.IsCancellationRequested || progressForm.Accepted))