diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index ce001ef5d..0fa17614e 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -112,7 +112,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			CreateAndAddChildren();
 
 			ActiveSliceSettings.SettingChanged.RegisterEvent(CheckSettingChanged, ref unregisterEvents);
-			ApplicationController.Instance.AdvancedControlsPanelReloading.RegisterEvent((s, e) => gcodeViewWidget?.Clear3DGCode(), ref unregisterEvents);
+
+			// TODO: Why do we clear GCode on AdvancedControlsPanelReloading - assume some slice settings should invalidate. If so, code should be more specific and bound to slice settings changed
+			ApplicationController.Instance.AdvancedControlsPanelReloading.RegisterEvent((s, e) => printer.BedPlate.GCodeRenderer?.Clear3DGCode(), ref unregisterEvents);
 		}
 
 		private GCodeFile loadedGCode => printer.BedPlate.LoadedGCode;
@@ -154,7 +156,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				}
 				else if (stringEvent.Data == "extruder_offset")
 				{
-					gcodeViewWidget.Clear3DGCode();
+					printer.BedPlate.GCodeRenderer.Clear3DGCode();
 				}
 			}
 		}
diff --git a/PartPreviewWindow/ViewGcodeWidget.cs b/PartPreviewWindow/ViewGcodeWidget.cs
index 849a2ca23..cfc286c16 100644
--- a/PartPreviewWindow/ViewGcodeWidget.cs
+++ b/PartPreviewWindow/ViewGcodeWidget.cs
@@ -133,9 +133,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			this.progressReporter = progressReporter;
 			this.gridSizeMm = gridSizeMm;
 			this.gridCenterMm = gridCenterMm;
-			LocalBounds = new RectangleDouble(0, 0, 100, 100);
-			//DoubleBuffer = true;
-			AnchorAll();
+
+			this.LocalBounds = new RectangleDouble(0, 0, 100, 100);
+			this.AnchorAll();
 		}
 
 		private void SetInitalLayer()
@@ -173,16 +173,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			}
 		}
 
-		internal void Clear3DGCode()
-		{
-			var renderer = printer.BedPlate.GCodeRenderer;
-			if (renderer != null)
-			{
-				renderer.Clear3DGCode();
-				this.Invalidate();
-			}
-		}
-
 		private PathStorage grid = new PathStorage();
 		static RGBA_Bytes gridColor = new RGBA_Bytes(190, 190, 190, 255);