diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 0e713f90..5fb2dfd3 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -216,7 +216,7 @@ namespace Volian.Controls.Library
 			// see if change in subsections to be displayed, i.e. if the user made a change to editable data
 			// on the section properties form, we may have to display steps or remove steps.  By design,
 			// steps are the first children from a section.
-			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
+			if (MyItemInfo.IsSection && MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
 			{
 				// find out what the editable flag is to determine if change.
 				bool showSteps = MyItemInfo.MyConfig is SectionConfig && (MyItemInfo.MyConfig as SectionConfig).SubSection_Edit == "Y";
@@ -615,10 +615,7 @@ namespace Volian.Controls.Library
 		public void RemoveItemWithoutDelete()
 		{
 			BeingRemoved = true;
-			//MyStepPanel.SelectedEditItem = null; // Unselect the item to be deleted
 			int TopMostYBefore = TopMostEditItem.Top;
-
-
 			MyStepPanel._LookupEditItems.Remove(MyID);
 			EditItem newFocus = null;
 			int? TopMostParentY = (MyParentEditItem == null ? null : (int?)(MyParentEditItem.TopMostEditItem.Top));
@@ -648,34 +645,19 @@ namespace Volian.Controls.Library
 				MyPreviousEditItem.MyNextEditItem = null;
 				newFocus = MyPreviousEditItem.BottomMostEditItem;
 				MyPreviousEditItem = null;
-				//Console.Write(",\"Previous\",");
 			}
 			else
 			{
 				newFocus = MyParentEditItem;
 				MyParentEditItem = null;
-				//Console.Write(",\"Parent\",");
 			}
-			//_MyTimer.ShowElapsedTimes("DeleteItem");
-			//KBR??return newFocus;
-
-
-			//EditItem newFocus = DeleteItem();
-			//if (newFocus == null) return;
-			////_MyTimer.ActiveProcess = "SetFocus";
-			//newFocus.SetFocus();
-			////_MyTimer.ActiveProcess = "Dispose";
-			//Dispose();
-			////_MyTimer.ActiveProcess = "SetAllTabs";
-			//newFocus.SetAllTabs();
-			////_MyTimer.ActiveProcess = "TopMostYAfter";
-			//int TopMostYAfter = newFocus.TopMostEditItem.Top;
-			//if (TopMostYAfter > TopMostYBefore)
-			//    newFocus.TopMostEditItem.Top = TopMostYBefore;
-			////_MyTimer.ActiveProcess = "AdjustLocation";
-			//newFocus.AdjustLocation();
-			////newFocus.ShowTops("");
-			////_MyTimer.ShowElapsedTimes("RemoveItem");
+			Dispose();
+			if (newFocus != null)
+			{
+				newFocus.SetFocus();
+				newFocus.SetAllTabs();
+				newFocus.AdjustLocation();
+			}
 		}
 		public void RemoveItem()
 		{