diff --git a/mozilla/java/webclient/src_moz/Makefile.in b/mozilla/java/webclient/src_moz/Makefile.in
index 98b23de4fd8..42c4590842c 100644
--- a/mozilla/java/webclient/src_moz/Makefile.in
+++ b/mozilla/java/webclient/src_moz/Makefile.in
@@ -54,7 +54,6 @@ CPPSRCS = \
 	RDFTreeNode.cpp \
 	WindowControlImpl.cpp \
 	WrapperFactoryImpl.cpp \
-	nsSetupRegistry.cpp \
 	motif/MotifBrowserControlCanvas.cpp \
 	motif/gtkmozilla.cpp \
 	$(NULL)
@@ -104,14 +103,7 @@ PACKAGE_LIB=$(PACKAGE_DIR)/lib
 PACKAGE_EXAMPLE=$(PACKAGE_DIR)/example
 endif # PACKAGE_BUILD
 
-export:: linkSetupRegistry
-
-linkSetupRegistry:
-	rm -f nsSetupRegistry.cpp
-	ln -s $(DEPTH)/xpfe/bootstrap/nsSetupRegistry.cpp .
-
 clobber_all::
-	rm -f nsSetupRegistry.cpp
 
 buildRunems:
 ifeq ($(BAL_INTERFACE),)
diff --git a/mozilla/java/webclient/src_moz/Makefile.win b/mozilla/java/webclient/src_moz/Makefile.win
index 47009e809e5..8ac36631d45 100644
--- a/mozilla/java/webclient/src_moz/Makefile.win
+++ b/mozilla/java/webclient/src_moz/Makefile.win
@@ -44,7 +44,6 @@ OBJS =                              \
     .\$(OBJDIR)\RDFEnumeration.obj  \
     .\$(OBJDIR)\RDFTreeNode.obj  \
     .\$(OBJDIR)\ISupportsPeer.obj  \
-#    .\$(OBJDIR)\nsSetupRegistry.obj  \
     $(NULL)
 
 
@@ -76,7 +75,6 @@ LLIBS = \
 	$(DIST)\lib\nspr4.lib \
 	$(DIST)\lib\plc4.lib \
 	$(DIST)\lib\plds4.lib \
-#	$(DEPTH)\xpfe\bootstrap\$(OBJDIR)\nsSetupRegistry.obj \
 	$(NULL)  
 
 WIN_LIBS=                       \
@@ -121,10 +119,6 @@ INCS = \
 !CMDSWITCHES -S
 
 # generate the jni header
-export:: nsSetupRegistry.cpp 
-
-nsSetupRegistry.cpp:
-	copy $(MOZ_SRC)\mozilla\xpfe\bootstrap\nsSetupRegistry.cpp
 
 buildRunems:
 !ifdef BAL_INTERFACE
@@ -142,6 +136,5 @@ clobber_all:: clobber
 
 clobber::
 	rm -f $(DIST)\bin\$(DLLNAME).dll
-	rm -f nsSetupRegistry.cpp
 	rm -f runem.bat
 
diff --git a/mozilla/java/webclient/src_moz/NativeEventThread.cpp b/mozilla/java/webclient/src_moz/NativeEventThread.cpp
index 7da1c35d793..b76b2b5169f 100644
--- a/mozilla/java/webclient/src_moz/NativeEventThread.cpp
+++ b/mozilla/java/webclient/src_moz/NativeEventThread.cpp
@@ -113,14 +113,6 @@ extern const char * gBinDir; // defined in WrapperFactoryImpl.cpp
 
 #endif // XP_PC
 
-//
-// Functions to hook into mozilla
-// 
-
-extern "C" void NS_SetupRegistry();
-extern nsresult NS_AutoregisterComponents();
-
-
 //
 // Local functions
 //
@@ -455,7 +447,6 @@ void DoMozInitialization(WebShellInitContext * initContext)
         // It is vitally important to call NS_InitEmbedding before calling
         // anything else.
         NS_InitEmbedding(pathFile, nsnull);
-        //        NS_SetupRegistry();
         rv = NS_GetGlobalComponentManager(&gComponentManager);
         if (NS_FAILED(rv)) {
             ::util_ThrowExceptionToJava(env, "NS_GetGlobalComponentManager() failed.");
@@ -471,8 +462,6 @@ void DoMozInitialization(WebShellInitContext * initContext)
         gComponentManager->RegisterComponentLib(kSHistoryCID, nsnull, 
                                                 nsnull, APPSHELL_DLL, 
                                                 PR_FALSE, PR_FALSE);
-        NS_AutoregisterComponents();
-
         // handle the profile manager nonsense
         nsCOMPtr<nsICmdLineService> cmdLine =do_GetService(kCmdLineServiceCID);
         nsCOMPtr<nsIProfile> profile = do_GetService(NS_PROFILE_CONTRACTID);