diff --git a/editor/guimgr/.cvsignore b/editor/guimgr/.cvsignore
deleted file mode 100644
index f3c7a7c5da68..000000000000
--- a/editor/guimgr/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/editor/guimgr/Makefile.in b/editor/guimgr/Makefile.in
deleted file mode 100644
index 02d34bc85dc2..000000000000
--- a/editor/guimgr/Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH = ../..
-topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = public src
-
-ifdef ENABLE_TESTS
-DIRS += tests
-endif
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/editor/guimgr/makefile.win b/editor/guimgr/makefile.win
deleted file mode 100644
index 63b069de897b..000000000000
--- a/editor/guimgr/makefile.win
+++ /dev/null
@@ -1,25 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=..\..
-
-
-# add "tests" after makefile is finished
-
-DIRS=public src
-
-include <$(DEPTH)\config\rules.mak>
diff --git a/editor/guimgr/public/.cvsignore b/editor/guimgr/public/.cvsignore
deleted file mode 100644
index f3c7a7c5da68..000000000000
--- a/editor/guimgr/public/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/editor/guimgr/public/MANIFEST b/editor/guimgr/public/MANIFEST
deleted file mode 100644
index c13ddbc84de1..000000000000
--- a/editor/guimgr/public/MANIFEST
+++ /dev/null
@@ -1,20 +0,0 @@
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-# This is a list of local files which get copied to the mozilla:dist:editor directory
-#
-
-nsIEditGuiManager.h
-nsIGuiManagerFactory.h
diff --git a/editor/guimgr/public/Makefile.in b/editor/guimgr/public/Makefile.in
deleted file mode 100644
index 7fe5792f10ba..000000000000
--- a/editor/guimgr/public/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXPORTS =               \
-    nsIEditGuiManager.h \
-    nsIGuiManagerFactory.h  \
-    $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = editor
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/editor/guimgr/public/makefile.win b/editor/guimgr/public/makefile.win
deleted file mode 100644
index e5bbcbe6b056..000000000000
--- a/editor/guimgr/public/makefile.win
+++ /dev/null
@@ -1,29 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=..\..\..
-
-
-EXPORTS =                    \
-    nsIGuiManagerFactory.h   \
-    nsIEditGuiManager.h	     \
-    $(NULL)
-
-MODULE = editor 
-
-include <$(DEPTH)\config\rules.mak>
-
diff --git a/editor/guimgr/public/nsIEditGuiManager.h b/editor/guimgr/public/nsIEditGuiManager.h
deleted file mode 100644
index 6ef6fcad637c..000000000000
--- a/editor/guimgr/public/nsIEditGuiManager.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsIEditGuiManager_h__
-#define nsIEditGuiManager_h__
-#include "nsISupports.h"
-
-/*
-Gui Manager interface to outside world
-*/
-
-#define NS_IEDITGUIMANAGER_IID \
-{ /* DD514F80-8BA7-11d2-9821-00805F8AA8B8 */ \
-0xdd514f80, 0x8ba7, 0x11d2, \
-{ 0x98, 0x21, 0x0, 0x80, 0x5f, 0x8a, 0xa8, 0xb8 } }
-
-/**
- * A Gui manager specific interface. 
- */
-class nsIEditGuiManager  : public nsISupports{
-public:
-
-};
-
-#endif // nsIEditGuiManager_h__
-
diff --git a/editor/guimgr/public/nsIGuiManagerFactory.h b/editor/guimgr/public/nsIGuiManagerFactory.h
deleted file mode 100644
index fd28e05b7c84..000000000000
--- a/editor/guimgr/public/nsIGuiManagerFactory.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsIGuiManagerFactory_h__
-#define nsIGuiManagerFactory_h__
-#include "nsISupports.h"
-
-/*
-Gui Manager interface to outside world
-*/
-
-#define NS_IGUIMANAGERFACTORY_IID \
-{ /* 6279AC00-8BD7-11d2-9821-00805F8AA8B8*/ \
-0x6279ac00, 0x8bd7, 0x11d2, \
-{ 0x98, 0x21, 0x0, 0x80, 0x5f, 0x8a, 0xa8, 0xb8 } }
-
-
-/**
- * A Gui manager specific interface. 
- */
-class nsIGuiManagerFactory  : public nsISupports{
-public:
-
-};
-
-#endif // nsIGuiManagerFactory_h__
-
diff --git a/editor/guimgr/src/.cvsignore b/editor/guimgr/src/.cvsignore
deleted file mode 100644
index f3c7a7c5da68..000000000000
--- a/editor/guimgr/src/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/editor/guimgr/src/Makefile.in b/editor/guimgr/src/Makefile.in
deleted file mode 100644
index cd839b419bf3..000000000000
--- a/editor/guimgr/src/Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=../../..
-
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME = editguimgr
-
-CPPSRCS =                   \
-	nsEditGuiManager.cpp	\
-	nsGuiManagerFactory.cpp \
-    $(NULL)
-
-MODULE = editguimgr
-
-REQUIRES = xpcom
-
-include $(topsrcdir)/config/config.mk
-
-TARGET = $(LIBARY)
-
-include $(topsrcdir)/config/rules.mk
-
-test:
-	@echo OS_ARCH = $(OS_ARCH)
diff --git a/editor/guimgr/src/makefile.win b/editor/guimgr/src/makefile.win
deleted file mode 100644
index 35c0fa275b9a..000000000000
--- a/editor/guimgr/src/makefile.win
+++ /dev/null
@@ -1,68 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=..\..\..
-
-
-LIBRARY_NAME=editguimgr
-
-CPPSRCS =                    \
-	nsEditGuiManager.cpp     \
-	nsGuiManagerFactory.cpp  \
-	$(NULL)
-
-CPP_OBJS =					\
-	.\$(OBJDIR)\nsEditGuiManager.obj	\
-	.\$(OBJDIR)\nsGuiManagerFactory.obj	\
-	$(NULL)
-
-MODULE=editguimgr 
-
-REQUIRES=xpcom base raptor
-
-LINCS=-I$(PUBLIC)\editor \
-	  -I$(PUBLIC)\xpcom  \
-      -I$(PUBLIC)\guimgr \
-      -I$(PUBLIC)\base \
-      -I$(PUBLIC)\raptor
-
-MAKE_OBJ_TYPE = DLL
-DLLNAME = editguimgr
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-# These are the libraries we need to link with to create the dll
-LLIBS=$(DIST)\lib\xpcom.lib
-
-!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
-LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
-!endif
-
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
-	rm -f $(DIST)\lib\$(DLLNAME).lib
diff --git a/editor/guimgr/src/nsEditGuiManager.cpp b/editor/guimgr/src/nsEditGuiManager.cpp
deleted file mode 100644
index 6af8f1c3e783..000000000000
--- a/editor/guimgr/src/nsEditGuiManager.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsEditGuiManager.h"
-#include "nsCOMPtr.h"
-
-#define LOCK_GUI_MANAGER(mgr)
-#define UNLOCK_GUI_MANAGER(mgr)
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIEditGuiManagerIID, NS_IEDITGUIMANAGER_IID);
-
-nsEditGuiManager::nsEditGuiManager()
-{
-}
-
-nsEditGuiManager::~nsEditGuiManager()
-{
-}
-
-NS_IMPL_ADDREF(nsEditGuiManager)
-NS_IMPL_RELEASE(nsEditGuiManager)
-
-NS_IMETHODIMP
-nsEditGuiManager::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kIEditGuiManagerIID)) {
-    *aInstancePtr = (void*)(nsIEditGuiManager*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  *aInstancePtr = 0;
-  return NS_NOINTERFACE;
-}
-
diff --git a/editor/guimgr/src/nsEditGuiManager.h b/editor/guimgr/src/nsEditGuiManager.h
deleted file mode 100644
index fab3f3a37d0d..000000000000
--- a/editor/guimgr/src/nsEditGuiManager.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://wwwt.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsEditGuiManager_h__
-#define nsEditGuiManager_h__
-
-#include "nsIEditGuiManager.h"
-
-/** implementation of an Editor GUI Manager object.
- *
- */
-class nsEditGuiManager : public nsIEditGuiManager
-{
-private:
-
-
-public:
-
-  /** The default constructor.
-   */
-  nsEditGuiManager();
-
-  /** The default destructor.
-   */
-  virtual ~nsEditGuiManager();
-
-  /* Macro for AddRef(), Release(), and QueryInterface() */
-  NS_DECL_ISUPPORTS
-
-  /* nsEditGuiManager method implementations. */
-
-  /* nsEditGuiManager specific methods. */
-};
-
-#endif // nsGuiManager_h__
diff --git a/editor/guimgr/src/nsGuiManagerFactory.cpp b/editor/guimgr/src/nsGuiManagerFactory.cpp
deleted file mode 100644
index cf6c4a0c1a92..000000000000
--- a/editor/guimgr/src/nsGuiManagerFactory.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://wwwt.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsIGuiManagerFactory.h"
-#include "nsEditGuiManager.h"
-#include "nsGuiManagerFactory.h"
-#include "nsIEditor.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-
-static NS_DEFINE_CID(kComponentManagerCID,   NS_COMPONENTMANAGER_CID);
-
-static NS_DEFINE_IID(kISupportsIID,          NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID,           NS_IFACTORY_IID);
-static NS_DEFINE_IID(kIGuiManagerFactoryIID, NS_IGUIMANAGERFACTORY_IID);
-
-
-
-nsresult
-getGuiManagerFactory(nsIFactory **aFactory)
-{
-  static nsCOMPtr<nsIFactory>  g_pNSIFactory;
-
-  nsresult result = NS_ERROR_FAILURE;
-  if (!g_pNSIFactory)
-  {
-    nsGuiManagerFactory *factory = new nsGuiManagerFactory(getter_AddRefs(g_pNSIFactory));
-    *aFactory = g_pNSIFactory;
-    NS_IF_ADDREF(*aFactory);
-    if (factory)
-      result = NS_OK;
-  }
-  else
-    result = g_pNSIFactory->QueryInterface(kIFactoryIID, (void **)aFactory);
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////
-// from nsISupports 
-
-NS_METHOD
-nsGuiManagerFactory::QueryInterface(const nsIID& aIID, void** aInstancePtr) 
-{
-  if (NULL == aInstancePtr) {
-    NS_NOTREACHED("!nsEditGuiManager");
-    return NS_ERROR_NULL_POINTER; 
-  } 
-  if (aIID.Equals(kIFactoryIID) ||
-    aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*) this; 
-    AddRef(); 
-    return NS_OK; 
-  }
-  return NS_NOINTERFACE; 
-}
-
-NS_IMPL_ADDREF(nsGuiManagerFactory)
-NS_IMPL_RELEASE(nsGuiManagerFactory)
-
-
-////////////////////////////////////////////////////////////////////////////
-// from nsIFactory:
-
-NS_METHOD
-nsGuiManagerFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-  nsEditGuiManager *guimgr = NULL;
-  *aResult  = NULL;
-  
-  if (aOuter && !aIID.Equals(kISupportsIID))
-    return NS_NOINTERFACE;   // XXX right error?
-  
-  guimgr = new nsEditGuiManager();
-  
-  if (NS_FAILED(guimgr->QueryInterface(aIID,(void**)aResult))) {
-    // then we're trying get a interface other than nsISupports and nsIEditGuiManager
-    delete guimgr;
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-
-
-NS_METHOD
-nsGuiManagerFactory::LockFactory(PRBool aLock)
-{
-  return NS_OK;
-}
-
-
-
-////////////////////////////////////////////////////////////////////////////
-// from nsFactory:
-
-nsGuiManagerFactory::nsGuiManagerFactory(nsIFactory **aFactory)
-{
-  NS_INIT_REFCNT();
-  nsresult     err         = NS_OK;
-  if (aFactory)
-  {
-    err = this->QueryInterface(kIFactoryIID, (void**)aFactory); 
-  }
-}
-
-nsGuiManagerFactory::~nsGuiManagerFactory()
-{
-  nsComponentManager::UnregisterFactory(kIGuiManagerFactoryIID, (nsIFactory *)this); //we are out of ref counts anyway
-}
-
-extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, const char *path)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  nsIComponentManager* compMgr;
-  rv = servMgr->GetService(kComponentManagerCID, 
-                           nsIComponentManager::GetIID(), 
-                           (nsISupports**)&compMgr);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = nsComponentManager::RegisterComponent(kIGuiManagerFactoryIID,
-                                             NULL, NULL, path,
-                                             PR_TRUE, PR_TRUE);
-  (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
-  return rv;
-}
-
-extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char *path)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  nsIComponentManager* compMgr;
-  rv = servMgr->GetService(kComponentManagerCID, 
-                           nsIComponentManager::GetIID(), 
-                           (nsISupports**)&compMgr);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = nsComponentManager::UnregisterComponent(kIGuiManagerFactoryIID, path);
-
-  (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
-  return rv;
-}
diff --git a/editor/guimgr/src/nsGuiManagerFactory.h b/editor/guimgr/src/nsGuiManagerFactory.h
deleted file mode 100644
index 18c2e7139562..000000000000
--- a/editor/guimgr/src/nsGuiManagerFactory.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://wwwt.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef nsGuiManagerFactory_h___
-#define nsGuiManagerFactory_h___
-
-#include "nsISupports.h"
-#include "nsIFactory.h"
-class nsEditGuiManager;
-
-/*
-GuiManagerFactory that can make an editor GUI manager
-*/
-
-/**
- *  This supplies the neccessary entrance to the edit module. it will return any 
- *  instantiations that we need.
- */
-class nsGuiManagerFactory;
-
-nsresult getGuiManagerFactory(nsIFactory **);
-
-class nsGuiManagerFactory : public nsIFactory {
-public:
-  ////////////////////////////////////////////////////////////////////////////
-  // from nsISupports and AggregatedQueryInterface:
-
-  NS_DECL_ISUPPORTS
-  
-  ////////////////////////////////////////////////////////////////////////////
-  // from nsIFactory:
-
-  NS_IMETHOD
-  CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-  NS_IMETHOD
-  LockFactory(PRBool aLock);
-
-
-  ////////////////////////////////////////////////////////////////////////////
-  // from nsFactory:
-
-  virtual ~nsGuiManagerFactory(void);
-private:
-  nsGuiManagerFactory(nsIFactory **aFactory); //will fill the aFactory with the result from queryinterface
-  friend nsresult getGuiManagerFactory(nsIFactory **);
-};
-
-#endif //nsGuiManagerFactory_h___