diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs
index 38367c48..399ea4f6 100644
--- a/PROMS/VEPROMS User Interface/dlgExportImport.cs	
+++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs	
@@ -720,7 +720,6 @@ namespace VEPROMS
 				ImportProcedureNew(xd);
 				isImported = true;
 			}
-			//if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
 			return true;// Import Suceeded
 		}
 
diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs
index 1357c074..b15ad4b1 100644
--- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs	
+++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs	
@@ -128,7 +128,7 @@ namespace VEPROMS
 		private LocalAnnotationTypeInfoList myLocalAnnotationTypeInfoList = null; 
 		private StageInfoList myStageInfoList = null;
 		private LocalStageInfoList myLocalStageInfoList = null;
-        private int? _cmbxformatOriginal = null;
+
 		private void frmFolderProperties_Load(object sender, EventArgs e)
 		{
 			_Initializing = true;
@@ -149,7 +149,7 @@ namespace VEPROMS
 			ppCmbxFormat.DisplayMember = "FullName";
 			ppCmbxFormat.ValueMember = "FullName";
 			ppCmbxFormat.DataSource = FormatUtility.GetFilteredFormatList(FormatInfoList.SortedFormatInfoList);
-			if (_FolderConfig != null && _FolderConfig.MyFolder != null) _cmbxformatOriginal = _FolderConfig.MyFolder.FormatID;
+
 			if (_FolderConfig.FormatSelection != null)
 			{
 				ppCmbxFormat.SelectedValue = _FolderConfig.FormatSelection;
diff --git a/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs
index 787ef016..d5617806 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs
@@ -213,14 +213,7 @@ namespace VEPROMS.CSLA.Library
 		[TypeConverter(typeof(ExpandableObjectConverter))]
 		public class Flags
 		{
-			//private bool? _CheckOffUCF;
-			//[DisplayName("UCF CheckOffs")]
-			//[Description("Additional UCF Check Offs and Sign Offs")]
-			//public bool? CheckOffUCF
-			//{
-			//	get { return _CheckOffUCF; }
-			//	set { _CheckOffUCF = value; }
-			//}
+
 			private bool? _PartialStepCompression;
 			[DisplayName("Partial Step Compression")]
 			[Description("Automatically compress last sub-steps to fit on page")]
@@ -286,14 +279,6 @@ namespace VEPROMS.CSLA.Library
 				set { _State = value; }
 			}
 
-			//[Editor(typeof(FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
-			//[XmlAttribute("Flag")]
-			//[DisplayName("Flags (Use In)")]         // Note that [Description] is not used in collection items (that use collection editor)
-			//public E_ReplaceFlags Flag
-			//{
-			//	get { return (E_ReplaceFlags)_Flag; }
-			//	set { _Flag = value; }
-			//}
 			private string _ReplaceWord;
 			[XmlAttribute("ReplaceWord")]
 			[DisplayName("Replace Word")]
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index 723857b9..466f6338 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -2195,7 +2195,6 @@ namespace VEPROMS.CSLA.Library
 			//int profileDepth = ProfileTimer.Push(">>>> DoReplaceWords2.ForLoop");
 			foreach (ReplaceStr rs in rsl)
 			{
-				//bool dopartial = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.Partials; // save it may need to be changed back to this code.
 				bool dopartial = (rs.Flag & E_ReplaceFlags.Partials) == E_ReplaceFlags.Partials; // from pre-UCF
 				if (!dopartial)     // F2021-093: Partials moved into their own method and done first
 				{