diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
index 2dbe08985e3..da4cc435827 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
@@ -1987,6 +1987,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
      * <b>You do not need to override this, as it does the progress monitor and error message
      *  displaying for you. Just override internalResolveFilterString.</b>
      * <p>
+     * This method should be avoided in favour of one that runs in a job.
+     * 
      * @param filterString filter pattern for objects to return.
      * @return the results of resolving the filter string. 
      */
@@ -1998,33 +2000,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
     	  ok = promptForPassword();
         if (ok)
         {
-          	Display display = Display.getCurrent();
-        	if (display != null)
-        	{
-        		return internalResolveFilterString(new NullProgressMonitor(), filterString);
-        	}
-        	else
-        	{
-    	  try
-    	  {
-//dwd   	    this.shell = shell; //FIXME remove this   	    	  	
-    	    ResolveAbsoluteJob job = new ResolveAbsoluteJob(filterString);
-    	    
-    	    IStatus status = scheduleJob(job, null, shell != null);
-    	    if (status.isOK())
-    	    {
-    	    	if (sortResults && (job.getOutputs()!=null))
-    	    		return sortResolvedFilterStringObjects(job.getOutputs());
-    	    	else
-    	    		return job.getOutputs();
-    	    }
-    	  }
-    	  catch (InterruptedException exc)
-    	  {
-    		  if (shell == null) throw exc;
-    		  else showOperationCancelledMessage(shell);
-    	  }
-        	}
+          	return internalResolveFilterString(new NullProgressMonitor(), filterString);
         }
         else
           System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$
@@ -2042,6 +2018,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
      * After successful resolve, the sort method is called to sort the concatenated results before
      *  returning them.
      *
+     * This method should be avoided in favour of one that runs in a job.
+     * 
      * @param filterStrings array of filter patterns for objects to return.
      * @return Array of objects that are the result of resolving all the filter strings
      */
@@ -2062,36 +2040,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
         
         if (ok)
         {
-        	Display display = Display.getCurrent();
-        	if (display != null)
-        	{
-        		return internalResolveFilterStrings(new NullProgressMonitor(), filterStrings);
-        	}
-        	else
-        	{
-    	  try
-    	  {
-//dwd    	    this.shell = shell; //FIXME remove this	
-    	    ResolveAbsolutesJob job = new ResolveAbsolutesJob(filterStrings[0], filterStrings);
-    	      	    
-    	    IStatus status = scheduleJob(job, null, true);
-    	    if (status.isOK())
-    	    {
-        	    if (sortResults && (job.getOutputs()!=null))
-                    return sortResolvedFilterStringObjects(job.getOutputs());
-                else
-                	return job.getOutputs();
-    	    }
-    	  }
-    	  catch (InterruptedException exc)
-    	  {
-    		  if (shell == null) throw exc;
-    		  else showOperationCancelledMessage(shell);
-    	  }    	
-        	}
+        	return internalResolveFilterStrings(new NullProgressMonitor(), filterStrings);
         }
-        else
-          System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$
+
     	return null;
     }
     
@@ -2306,6 +2257,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
      * <b>You do not need to override this, as it does the progress monitor and error message
      *  displaying for you. Override internalResolveFilterString instead. </b>
      * <p>
+     * 
+     * This method should be avoided in favour of one that runs in a job.
+     * 
      * @param parent Object that is being expanded.
      * @param filterString filter pattern for children of parent. Typically just "*".
      */
@@ -2317,36 +2271,12 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
     	  ok = promptForPassword();
         if (ok)
         {
-        	Display display = Display.getCurrent();
-        	if (display != null)
-        	{
-        		return internalResolveFilterString(new NullProgressMonitor(), parent, filterString);
-        	}
-        	else
-        	{
-    	  try
-    	  {    	    	  	
- //dwd   	    this.shell = shell; //FIXME remove this
-  		
-    	    ResolveRelativeJob job = new ResolveRelativeJob(filterString, parent);
-    	    
-    	    IStatus status = scheduleJob(job, null, true);
-    	    if (status.isOK())
-    	    {
-        	    if ((job.getOutputs()!=null) && (job.getOutputs().length>1))
-          	      return sortResolvedFilterStringObjects(job.getOutputs());           
-        	    else return job.getOutputs();
-    	    }
-    	  }
-    	  catch (InterruptedException exc)
-    	  {
-    		  if (shell == null) throw exc;
-    		  else showOperationCancelledMessage(shell);
-    	  }
-        	}
+        	return internalResolveFilterString(new NullProgressMonitor(), parent, filterString);
         }
         else
+        {
           SystemBasePlugin.logDebugMessage(this.getClass().getName(), "in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$
+        }
     	return null;
     }