diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs
index 07c3537db..0d4099c43 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs
@@ -46,8 +46,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 
 		protected Vector3 probeStartPosition;
 
-		public AutoProbeFeedback(ISetupWizard context, Vector3 probeStartPosition, string headerText, List<ProbePosition> probePositions, int probePositionsBeingEditedIndex)
-			: base(context, headerText, headerText)
+		public AutoProbeFeedback(ISetupWizard setupWizard, Vector3 probeStartPosition, string headerText, List<ProbePosition> probePositions, int probePositionsBeingEditedIndex)
+			: base(setupWizard, headerText, headerText)
 		{
 			this.probeStartPosition = probeStartPosition;
 			this.probePositions = probePositions;
diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPageInstructions.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPageInstructions.cs
index dbeb49d6c..b60c75f0f 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPageInstructions.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPageInstructions.cs
@@ -41,8 +41,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 	{
 		private bool pageWasActive = false;
 
-		public CalibrateProbeLastPageInstructions(ISetupWizard context, string headerText)
-			: base(context, headerText, "")
+		public CalibrateProbeLastPageInstructions(ISetupWizard setupWizard, string headerText)
+			: base(setupWizard, headerText, "")
 		{
 			var calibrated = "Your Probe is now calibrated.".Localize() + "\n"
 				+ "    • " + "Remove the paper".Localize() + "\n"
diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs
index 4c31c8b91..2693f3b51 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs
@@ -49,9 +49,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 		protected JogControls.MoveButton zMinusControl;
 		private RunningInterval runningInterval;
 
-		public FindBedHeight(ISetupWizard context, string pageDescription, string setZHeightCoarseInstruction1, string setZHeightCoarseInstruction2, double moveDistance,
+		public FindBedHeight(ISetupWizard setupWizard, string pageDescription, string setZHeightCoarseInstruction1, string setZHeightCoarseInstruction2, double moveDistance,
 			List<ProbePosition> probePositions, int probePositionsBeingEditedIndex)
-			: base(context, pageDescription, setZHeightCoarseInstruction1)
+			: base(setupWizard, pageDescription, setZHeightCoarseInstruction1)
 		{
 			this.probePositions = probePositions;
 			this.moveAmount = moveDistance;
diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs
index fce4c8ebe..37957252e 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs
@@ -34,10 +34,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 {
 	public class GetUltraFineBedHeight : FindBedHeight
 	{
-		public GetUltraFineBedHeight(ISetupWizard context, string pageDescription, List<ProbePosition> probePositions,
+		public GetUltraFineBedHeight(ISetupWizard setupWizard, string pageDescription, List<ProbePosition> probePositions,
 			int probePositionsBeingEditedIndex, LevelingStrings levelingStrings)
 			: base(
-				context, 
+				setupWizard, 
 				pageDescription, 
 				"We will now finalize our measurement of the extruder height at this position.".Localize(), 
 				levelingStrings.FineInstruction2, 
diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs
index 0eb68b20d..91ad3fe7e 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs
@@ -41,9 +41,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 		private ProbePosition probePosition;
 		private EventHandler unregisterEvents;
 
-		public GettingThirdPointFor2PointCalibration(ISetupWizard context, string pageDescription, Vector3 probeStartPosition, string instructionsText,
+		public GettingThirdPointFor2PointCalibration(ISetupWizard setupWizard, string pageDescription, Vector3 probeStartPosition, string instructionsText,
 			ProbePosition probePosition)
-			: base(context, pageDescription, instructionsText)
+			: base(setupWizard, pageDescription, instructionsText)
 		{
 			this.probeStartPosition = probeStartPosition;
 			this.probePosition = probePosition;
diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs
index 781dba064..b4ed0e02f 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs
@@ -38,8 +38,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 	{
 		private bool autoAdvance;
 
-		public HomePrinterPage(ISetupWizard context, string headerText, string instructionsText, bool autoAdvance)
-			: base(context, headerText, instructionsText)
+		public HomePrinterPage(ISetupWizard setupWizard, string headerText, string instructionsText, bool autoAdvance)
+			: base(setupWizard, headerText, instructionsText)
 		{
 			this.autoAdvance = autoAdvance;
 		}
diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs
index d9aa33ef9..81936cc2f 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs
@@ -42,8 +42,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 	{
 		private List<ProbePosition> probePositions;
 
-		public LastPageInstructions(ISetupWizard context, string pageDescription, bool useZProbe, List<ProbePosition> probePositions)
-			: base(context, pageDescription, "")
+		public LastPageInstructions(ISetupWizard setupWizard, string pageDescription, bool useZProbe, List<ProbePosition> probePositions)
+			: base(setupWizard, pageDescription, "")
 		{
 			this.probePositions = probePositions;
 
diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs
index ceb5401ff..9e856d1b7 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs
@@ -36,8 +36,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 {
 	public class SelectMaterialPage : WizardPage
 	{
-		public SelectMaterialPage(ISetupWizard context, string headerText, string instructionsText, string nextButtonText, int extruderIndex, bool showLoadFilamentButton, bool showAlreadyLoadedButton)
-			: base(context, headerText, instructionsText)
+		public SelectMaterialPage(ISetupWizard setupWizard, string headerText, string instructionsText, string nextButtonText, int extruderIndex, bool showLoadFilamentButton, bool showAlreadyLoadedButton)
+			: base(setupWizard, headerText, instructionsText)
 		{
 			contentRow.AddChild(
 				new PresetSelectorWidget(printer, "Material".Localize(), Color.Transparent, NamedSettingsLayers.Material, extruderIndex, theme)
@@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 				};
 				loadFilamentButton.Click += (s, e) =>
 				{
-					if(setupWizard.GetNextPage() is WizardPage wizardPage)
+					if(base.setupWizard.GetNextPage() is WizardPage wizardPage)
 					{
 						this.DialogWindow.ChangeToPage(wizardPage);
 					}
diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs
index d89eba943..945109cdc 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs
@@ -52,10 +52,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 		private List<TextWidget> hotEndDoneTexts = new List<TextWidget>();
 		private double[] targetHotendTemps;
 
-		public WaitForTempPage(ISetupWizard context,
-			string step, string instructions,
-			double targetBedTemp, double[] targetHotendTemps)
-			: base(context, step, instructions)
+		public WaitForTempPage(ISetupWizard setupWizard, string step, string instructions, double targetBedTemp, double[] targetHotendTemps)
+			: base(setupWizard, step, instructions)
 		{
 			this.bedTargetTemp = targetBedTemp;
 			this.targetHotendTemps = targetHotendTemps;
diff --git a/MatterControlLib/CustomWidgets/NozzleOffsetCalibrationPage.cs b/MatterControlLib/CustomWidgets/NozzleOffsetCalibrationPage.cs
index dd4f693c8..041580f58 100644
--- a/MatterControlLib/CustomWidgets/NozzleOffsetCalibrationPage.cs
+++ b/MatterControlLib/CustomWidgets/NozzleOffsetCalibrationPage.cs
@@ -28,8 +28,6 @@ either expressed or implied, of the FreeBSD Project.
 */
 
 using System;
-using System.Threading;
-using System.Threading.Tasks;
 using MatterHackers.Agg;
 using MatterHackers.Agg.UI;
 using MatterHackers.Localizations;