diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 1cc91783c42..798c1b0465a 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-26 Alain Magloire
+
+	CUIPlugin.startup() cleanup.  The method
+	was trying to get the UI thread, not necessary.
+
 2004-05-26 Alain Magloire
 
 	Jumbo Patch from Chris Wiebe.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
index 33770e3dc3c..b41538867c6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
@@ -20,7 +20,6 @@ import org.eclipse.cdt.core.model.ISourceRoot;
 import org.eclipse.cdt.core.model.ITemplate;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
-import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
 import org.eclipse.cdt.ui.CElementImageDescriptor;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.resources.IFile;
@@ -88,10 +87,7 @@ public class CElementImageProvider {
 		DESC_OBJ_FOLDER= 		 images.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
 	}
 	
-	private ImageDescriptorRegistry fRegistry;
-		
 	public CElementImageProvider() {
-		fRegistry= CUIPlugin.getImageDescriptorRegistry();
 	}	
 		
 	/**
@@ -117,7 +113,7 @@ public class CElementImageProvider {
 			descriptor= getWorkbenchImageDescriptor((IAdaptable) element, flags);
 		}
 		if (descriptor != null) {
-			return fRegistry.get(descriptor);
+			return CUIPlugin.getImageDescriptorRegistry().get(descriptor);
 		}
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
index 10267b5aa77..8cd0dd61dc9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
@@ -229,26 +229,6 @@ public class CPluginImages {
 	public static final ImageDescriptor DESC_OBJS_FILE_CHANGE= create(T_OBJ, "file_change.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_OBJS_TEXT_EDIT= create(T_OBJ, "text_edit.gif"); //$NON-NLS-1$
 	
-	public static void initialize() {
-		//createManaged(registry, T_OBJ, IMG_OBJS_TUNIT);
-		//createManaged(registry, T_OBJ, IMG_OBJS_FIELD);
-		//createManaged(registry, T_OBJ, IMG_OBJS_CLASS);
-		//createManaged(registry, T_OBJ, IMG_OBJS_STRUCT);
-		//createManaged(registry, T_OBJ, IMG_OBJS_UNION);
-		//createManaged(registry, T_OBJ, IMG_OBJS_FUNCTION);
-		//createManaged(registry, T_OBJ, IMG_OBJS_INCLUDE);
-		//createManaged(registry, T_OBJ, IMG_OBJS_DEFINE);
-
-		//createManaged(registry, T_OBJ, IMG_OBJS_ARCHIVE);
-		//createManaged(registry, T_OBJ, IMG_OBJS_SHLIB);
-		//createManaged(registry, T_OBJ, IMG_OBJS_BINARY);
-		//createManaged(registry, T_OBJ, IMG_OBJS_CEXEC);
-		//createManaged(registry, T_OBJ, IMG_OBJS_CEXEC_DEBUG);
-		//createManaged(registry, T_OBJ, IMG_OBJS_CONTAINER);
-
-		//createManaged(registry, T_OBJ, IMG_OBJS_TEMPLATE);
-	}
-	
 	private static ImageDescriptor createManaged(String prefix, String name) {
 		return createManaged(imageRegistry, prefix, name);
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java
index cd2820e463a..d6b0c29d89f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java
@@ -17,7 +17,6 @@ import org.eclipse.cdt.internal.ui.CElementImageProvider;
 import org.eclipse.cdt.internal.ui.ErrorTickAdornmentProvider;
 import org.eclipse.cdt.internal.ui.IAdornmentProvider;
 import org.eclipse.cdt.internal.ui.search.CElementLabels;
-import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
@@ -82,7 +81,6 @@ public class CElementLabelProvider extends LabelProvider {
 	
 	public final static int SHOW_DEFAULT= new Integer(SHOW_PARAMETERS | SHOW_OVERLAY_ICONS).intValue();
 	
-	private ImageRegistry fImageRegistry;
 	private WorkbenchLabelProvider fWorkbenchLabelProvider;
 	private CElementImageProvider fImageLabelProvider;
 	private IAdornmentProvider[] fAdornmentProviders;
@@ -104,7 +102,6 @@ public class CElementLabelProvider extends LabelProvider {
 	 * @param imageFlags Flags defined in <code>CElementImageProvider</code>.
 	 */
 	public CElementLabelProvider(int flags, IAdornmentProvider[] adormentProviders) {
-		fImageRegistry= CUIPlugin.getDefault().getImageRegistry();
 		fWorkbenchLabelProvider= new WorkbenchLabelProvider();
 		
 		fImageLabelProvider= new CElementImageProvider();
@@ -223,7 +220,6 @@ public class CElementLabelProvider extends LabelProvider {
 			fWorkbenchLabelProvider.dispose();
 			fWorkbenchLabelProvider= null;
 		}
-		fImageRegistry= null;
 		if(fImageLabelProvider != null) {
 			fImageLabelProvider.dispose();
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
index 382a4f1f677..262a1c74b51 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
@@ -29,7 +29,6 @@ import org.eclipse.cdt.core.model.IWorkingCopy;
 import org.eclipse.cdt.internal.core.model.IBufferFactory;
 import org.eclipse.cdt.internal.corext.refactoring.base.Refactoring;
 import org.eclipse.cdt.internal.ui.CElementAdapterFactory;
-import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.ICStatusConstants;
 import org.eclipse.cdt.internal.ui.IContextMenuConstants;
 import org.eclipse.cdt.internal.ui.ResourceAdapterFactory;
@@ -399,16 +398,10 @@ public class CUIPlugin extends AbstractUIPlugin {
 		//Set debug tracing options
 		CUIPlugin.getDefault().configurePluginDebugOptions();
 		
-		runUI(new Runnable() {
-			public void run() {
-				registerAdapters();
-				CPluginImages.initialize();
-				
-				AllTypesCache.initialize(new IWorkingCopyProvider() {
-					public IWorkingCopy[] getWorkingCopies() {
-						return CUIPlugin.getSharedWorkingCopies();
-					}
-				});
+		registerAdapters();
+		AllTypesCache.initialize(new IWorkingCopyProvider() {
+			public IWorkingCopy[] getWorkingCopies() {
+				return CUIPlugin.getSharedWorkingCopies();
 			}
 		});
 	}