diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/UniversalPreferencePage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/UniversalPreferencePage.java
index 6d936428de5..3a083348942 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/UniversalPreferencePage.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/UniversalPreferencePage.java
@@ -631,10 +631,6 @@ public class UniversalPreferencePage
 			Shell shell = getControl().getShell();
 			SystemMessage message = mf.getMessage(ISystemMessages.MSG_ERROR_EXTENSION_EMPTY);
 			SystemMessageDialog.displayErrorMessage(shell, message);
-// Removed by DWD - 2004-07-28 - these two messages don't exist
-//			MessageDialog.openInformation(getControl().getShell(),
-//				GenericMessages.getString("FileEditorPreference.extensionEmptyTitle"),
-//				GenericMessages.getString("FileEditorPreference.extensionEmptyMessage"));
 			return;
 		}
 
@@ -653,10 +649,6 @@ public class UniversalPreferencePage
 					Shell shell = getControl().getShell();
 					SystemMessage message = mf.getMessage(ISystemMessages.MSG_ERROR_FILENAME_INVALID);
 					SystemMessageDialog.displayErrorMessage(shell, message);
-// removed by DWD - 2004-07-28 - these two messages don't exist
-//					MessageDialog.openInformation(getControl().getShell(),
-//						GenericMessages.getString("FileEditorPreference.fileNameInvalidTitle"),
-//						GenericMessages.getString("FileEditorPreference.fileNameInvalidMessage"));
 					return;
 				}
 			}
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilter.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilter.java
index decfcd2d8c3..ab2856aac63 100644
--- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilter.java
+++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilter.java
@@ -381,10 +381,8 @@ public class SystemFilter extends SystemReferencedObject implements ISystemFilte
 		  targetFilter.setStringsCaseSensitive(isStringsCaseSensitive());
     	// clone filter strings
     	ISystemFilterString[] strings = getSystemFilterStrings();
-//    	ISystemFilterString newString = null; DWD - useless code, remove this after testing.
     	if (strings != null) {
     	  for (int idx=0; idx<strings.length; idx++) {
-//    	     newString = copySystemFilterString(targetFilter, strings[idx]); DWD useless code, remove after testing
     	     copySystemFilterString(targetFilter, strings[idx]);
     	  }
     	}
@@ -652,7 +650,6 @@ public class SystemFilter extends SystemReferencedObject implements ISystemFilte
     	if (filterStringVector == null)
     	{
     	  java.util.List el = internalGetFilterStrings();
-//    	  ISystemFilterString[] strings = new ISystemFilterString[el.size()]; DWD - useless code.
     	  Iterator i = el.iterator();
     	  filterStringVector = new Vector();
     	  while (i.hasNext())
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java
index e38501f449f..25d32ae8a96 100644
--- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java
+++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java
@@ -714,7 +714,6 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
         {
           for (int idx=0; idx<filters.length; idx++)
           {
-//    		ISystemFilter newFilter = copySystemFilter(targetPool, filters[idx], filters[idx].getName()); DWD - useless assignment.
     		copySystemFilter(targetPool, filters[idx], filters[idx].getName());
           }
         }
@@ -923,20 +922,6 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
     // -----------------------
     // SAVE/RESTORE METHODS...
     // -----------------------
-    /**
-     * Return the save file that will be written for the given filter pool.
-     * Will depend on this manager's save policy.
-     */
-//    public IFile getSaveFile() DWD - useless, not called since persistence model has changed.
-//    {
-//        String fileName = getRootSaveFileName(this);
-//        return null;//FIXME SystemMOFHelpers.getSaveFile(getFolder(),fileName);
-//    }
-    
-   
-
- 
-
 
     /**
      * Restore specific filter pool. You should not call this directly, as it is possible
@@ -1017,46 +1002,6 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
         return pool;
     }
     
-    /**
-     * Do restore when all filters in this pool are stored in a single file.
-     */
-//    protected static ISystemFilterPool restoreFromOneFile(IFolder folder, String name, 
-//                                                         ISystemFilterNamingPolicy namingPolicy,
-//                                                         boolean restoreFilters) DWD - useless, not called since persistence model has changed
-//     throws Exception
-//    {
-//    	
-//    	String fileName = getRootSaveFileName(namingPolicy, name);
-//        ISystemFilterPool pool = null;
-        /*FIXME
-        if (!restoreFilters && !SystemResourceHelpers.getResourceHelpers().getFile(folder, fileName+".xmi").exists())
-        {
-          // special case: data file might not exist, as only started saving it recently.
-          pool = createPool();
-          ((SystemFilterPoolImpl)pool).specialCaseNoDataRestored = true;
-          RSEUIPlugin.logInfo("Created filter pool file " + fileName+".xmi during restore");
-        }
-        else
-        {
-			//Extent java.util.List = mofHelpers.restore(folder,fileName); MOF way
-			java.util.List = mofHelpers.restore(folder,fileName);
-			// should be exactly one system filter pool...
-			Iterator iList = java.util.List.iterator();
-			pool = (SystemFilterPool)iList.next();
-        }
-        if (pool != null)
-        {
-          pool.setName(name);
-          if (restoreFilters)
-          {
-          	((SystemFilterPoolImpl)pool).initializeFilterStrings();
-          }
-        }
-        else
-          RSEUIPlugin.logInfo("Hmmm, pool is still null after restore: " + fileName+".xmi");
-          */
-//        return pool;	        
-//    }
 
     /**
      * Internal use method
@@ -1367,31 +1312,9 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
 		}
 	}
 	
-//	public boolean isDirty() DWD - useless and dangerous code, overrides default with same
-//	{
-//		return _isDirty;
-//	}
-	
-//	public void setDirty(boolean flag) DWD - useless and dangerous code, overrides default with same
-//	{
-//		if (_isDirty != flag)
-//		{
-//			_isDirty= flag;
-//		}
-//	}
-	
 	public boolean commit()
 	{
 		return RSEUIPlugin.getThePersistenceManager().commit(this);
 	}
 
-//	public boolean wasRestored() DWD - useless and dangerous code, overrides default with same
-//	{
-//		return _wasRestored;
-//	}
-	
-//	public void setWasRestored(boolean flag) DWD - useless and dangerous code, overrides default with same
-//	{
-//		_wasRestored = flag;
-//	}
 }
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolManager.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolManager.java
index 6b3cb5a9b22..2e15ed7311c 100644
--- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolManager.java
@@ -663,7 +663,6 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
     	  	 }
     	  }
     	}    	
-//    	String poolName = pool.getName(); DWD - useless code
     	// DWD removing a pool should mark its parent profile as dirty and cause a save to be "scheduled"
    
     	// remove from model
@@ -735,7 +734,6 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
     public boolean preTestRenameFilterPool(ISystemFilterPool pool) throws Exception
     {
     	boolean ok = true;
-//    	String oldName = pool.getName(); DWD temporarily removed.
     	/*
     	 * DWD this looks like it needs to be modified so that it queries the persistence
     	 * manager to see if the pool can be renamed. The provider is in charge of determining
@@ -816,10 +814,10 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
     	 */
     	
     	String oldName = pool.getName();
-//    	int oldLen = oldName.length(); DWD temporarily(?) removed
-//    	int newLen = newName.length(); DWD temporarily(?) removed
         // rename on disk
         /* FIXME
+    	int oldLen = oldName.length();
+    	int newLen = newName.length();
     	if ( (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL) ||
     	     (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_FILTER) )
     	{
@@ -1368,7 +1366,7 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
     	/*
     	 * DWD revisit this. Make sure that the pool is scheduled to be saved.
     	 */
-//    	ISystemFilterContainer container = filters[0].getParentFilterContainer(); DWD temporarily(?) removed.
+//    	ISystemFilterContainer container = filters[0].getParentFilterContainer(); 
     	int[] oldPositions = new int[filters.length];
     	for (int idx=0; idx<filters.length; idx++)
     	   oldPositions[idx] = getSystemFilterPosition(filters[idx]);
@@ -1571,7 +1569,7 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
         ISystemFilterPool       targetPool = targetFilter.getParentFilterPool();
     	ISystemFilterPoolManager targetMgr = targetPool.getSystemFilterPoolManager();
         ISystemFilter     oldFilter = oldFilterString.getParentSystemFilter();
-//        ISystemFilterPool oldPool = oldFilter.getParentFilterPool(); DWD temporarily(?) removed.
+//        ISystemFilterPool oldPool = oldFilter.getParentFilterPool(); 
 
         targetMgr.suspendCallbacks(true);         
 
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java
index 3b3a78cbd4e..bdb21960605 100644
--- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java
@@ -352,7 +352,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
     	/*
     	 * DWD Setting a name should schedule a save. Is this the same as a rename?
     	 */
-//    	String oldName = getName(); DWD temporarily(?) removed.
+//    	String oldName = getName();
     	if (savePolicy == ISystemFilterSavePolicies.SAVE_POLICY_ONE_FILE_PER_MANAGER)
     	{
     	  IFile file = getResourceHelpers().getFile(getFolder(), getSaveFileName());
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Host.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Host.java
index c6b6525b8b3..13e8ad35fba 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Host.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Host.java
@@ -267,7 +267,6 @@ public class Host extends RSEModelObject implements IHost, IAdaptable
      */
 	public void setAliasName(String newName)
     {
-//    	String oldName = getAliasName();  DWD temporarily(?) removed
     	String userIdValue = null;
     	if (previousUserIdKey != null)
    	       userIdValue = getLocalDefaultUserId(previousUserIdKey);     	  
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java
index d9c8e53fc99..62ca6c6a89e 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java
@@ -462,7 +462,7 @@ public class SystemHostPool extends RSEModelObject implements ISystemHostPool
     	 * It appears that connections can be moved up and down in the list which
     	 * probably provides for some rational for keeping this around.
     	 */
-//        java.util.List connList = getHostList(); DWD temporarily(?) removed.
+//        java.util.List connList = getHostList();
        //FIXME connList.move(newPos, conn);
         invalidateCache();
     }
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java
index 47837ddb8fa..a788d662bf6 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java
@@ -29,7 +29,7 @@ public class SystemPreferenceChangeEvent
 	   extends EventObject
 	   implements ISystemPreferenceChangeEvent
 {
-	private static final long serialVersionUID = 1; // DWD added for warning suppression remove this comment when tested.
+	private static final long serialVersionUID = 1;
 	private int type;
     private Object oldValue, newValue;
 	
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
index 5f42c63ca3c..a7713f27550 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
@@ -2319,7 +2319,6 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
 	public void updateHost(Shell shell, IHost conn, String systemType, String connectionName, String hostName, String description, String defaultUserId, int defaultUserIdLocation)
 	{
 		lastException = null;
-//		String orgUserId = conn.getDefaultUserId(); DWD temporaily(?) removed.
 		boolean connectionNameChanged = !connectionName.equalsIgnoreCase(conn.getAliasName());
 		boolean hostNameChanged = !hostName.equalsIgnoreCase(conn.getHostName());
 		String orgDefaultUserId = conn.getDefaultUserId();
@@ -2487,17 +2486,14 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
 		boolean failed = false;
 		String msg = null;
 		String oldName = conn.getAliasName();
-//		ISystemProfile oldProfile = conn.getSystemProfile(); DWD temporarily(?) removed
 		ISystemHostPool oldPool = conn.getHostPool();
 		ISystemHostPool targetPool = getHostPool(targetProfile);
 		IHost newConn = null;
-//		boolean sameName = (newName.equals(conn.getAliasName())); DWD temporarily(?) removed.
 
 		SystemBasePlugin.logDebugMessage(this.getClass().getName(), "Start of system connection copy. From: " + oldName + " to: " + newName);
 
 		// STEP 0: BRING ALL IMPACTED SUBSYSTEM FACTORIES TO LIFE NOW, BEFORE DOING THE CLONE.
-//		Vector factories = getSubSystemFactories(conn); DWD temporarily(?) removed.
-		getSubSystemFactories(conn); // DWD touched remove comment after testing
+		getSubSystemFactories(conn);
 		if (errorLoadingFactory)
 			return null;
 
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemResourceChangeEvent.java
index 9d0cbd462ef..ad239132f3a 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemResourceChangeEvent.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemResourceChangeEvent.java
@@ -30,7 +30,7 @@ public class SystemResourceChangeEvent
 	   extends EventObject
 	   implements ISystemResourceChangeEvent
 {
-	private static final long serialVersionUID = 1; // DWD needed for EventObjects remove comment after testing
+	private static final long serialVersionUID = 1;
 	private Object parent,grandparent, prevObj;
 	private Object[] multiSource;
 	private Viewer   originatingViewer;
diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java
index 98eec100f65..b2c7950e955 100644
--- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java
@@ -226,7 +226,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
 	 */
 	public void moveReferencingObjectPosition(int newPosition, ISystemBasePersistableReferencingObject object)
 	{
-//    	List list = internalGetList(); DWD temporarily(?) removed
+//    	List list = internalGetList(); 
     //FIXME	list.move(newPosition, object);		
 	}
 
diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java
index 8455ddc3533..7bd2c329c0b 100644
--- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java
+++ b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java
@@ -41,8 +41,6 @@ public abstract class SystemPersistableReferencingObject extends SystemReferenci
 	 */
 	protected static final String REFERENCED_OBJECT_NAME_EDEFAULT = null;
 
-//    private SystemReferencingObjectHelper helper = null; DWD dangerous, overriding and covering superclass
-
 	/**
 	 * @generated This field/method will be replaced during code generation.
 	 */
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
index 238898bbcd1..44b44b838f1 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
@@ -852,7 +852,6 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	 */
 	public ISystemValidator getUserIdValidator()
 	{
-//		RSEUIPlugin sp = RSEUIPlugin.getDefault(); DWD - to be removed. Appears to be useless.
 		ISystemValidator userIdValidator =
 			new ValidatorSpecialChar(
 				"=;",
@@ -1106,8 +1105,6 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 		java.util.List mofList = getSubSystemList();
 		Iterator i = mofList.iterator();
 		Vector v = new Vector();
-//		String connProfileName = conn.getSystemProfile().getName(); DWD - to be removed, appears to be useless.
-//		String connAliasName = conn.getAliasName(); DWD - to be removed.
 		while (i.hasNext())
 		{
 			ISubSystem subsys = (ISubSystem) i.next();
@@ -1125,7 +1122,6 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	 */
 	public ISubSystem[] getSubSystems(ISystemProfile profile)
 	{
-//		String profileName = profile.getName(); DWD - to be removed.
 		ISubSystem[] allSubSystems = getSubSystems(true);
 		Vector v = new Vector();
 		for (int idx = 0; idx < allSubSystems.length; idx++)