diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index 2b01c16aad6..55c755a67e0 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -57,7 +57,6 @@
 #include "nsIXMLDocument.h"
 #include "nsIScrollableView.h"
 #include "nsIDOMSelectionListener.h"
-#include "nsISelectionMgr.h"
 #include "nsIParser.h"
 #include "nsParserCIID.h"
 #include "nsHTMLContentSinkStream.h"
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index 2b01c16aad6..55c755a67e0 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -57,7 +57,6 @@
 #include "nsIXMLDocument.h"
 #include "nsIScrollableView.h"
 #include "nsIDOMSelectionListener.h"
-#include "nsISelectionMgr.h"
 #include "nsIParser.h"
 #include "nsParserCIID.h"
 #include "nsHTMLContentSinkStream.h"
diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
index a2b794107fe..e96dcc6874e 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -85,9 +85,6 @@
 // For Copy
 #include "nsIDOMSelection.h"
 
-#include "nsISelectionMgr.h"
-
-
 // XXX For font setting below
 #include "nsFont.h"
 #include "nsUnitConversion.h"
diff --git a/mozilla/widget/public/Makefile.in b/mozilla/widget/public/Makefile.in
index 705ecc0885e..cc61a6dc83c 100644
--- a/mozilla/widget/public/Makefile.in
+++ b/mozilla/widget/public/Makefile.in
@@ -74,7 +74,6 @@ EXPORTS = \
 	nsIDragService.h \
 	nsIClipboardOwner.h \
 	nsIFormatConverter.h \
-	nsISelectionMgr.h \
 	$(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
diff --git a/mozilla/widget/public/nsIAppShell.h b/mozilla/widget/public/nsIAppShell.h
index 2319d57afa1..4ca70b1e847 100644
--- a/mozilla/widget/public/nsIAppShell.h
+++ b/mozilla/widget/public/nsIAppShell.h
@@ -43,7 +43,6 @@ class nsDispatchListener {
 };
 
 class nsIWidget;
-class nsISelectionMgr;
 
 /**
  * Application shell used for Test applications
@@ -115,12 +114,6 @@ public:
    */
   NS_IMETHOD EventIsForModalWindow(PRBool aRealEvent, void *aEvent, nsIWidget *aWidget,
                                   PRBool *aForWindow) = 0;
- /**
-  * Get the selection manager.
-  */
-  
-  NS_IMETHOD GetSelectionMgr(nsISelectionMgr** aSelectionMgr) = 0;
-
 
 };
 
diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in
index f0c23837394..8c53e1ff5f5 100644
--- a/mozilla/widget/src/gtk/Makefile.in
+++ b/mozilla/widget/src/gtk/Makefile.in
@@ -63,7 +63,6 @@ CPPSRCS= \
 	nsPopUpMenu.cpp \
 	nsWidget.cpp \
 	nsWindow.cpp \
-	nsSelectionMgr.cpp \
 	$(NULL)
 
 TARGETS = $(LIBRARY)
diff --git a/mozilla/widget/src/gtk/nsAppShell.cpp b/mozilla/widget/src/gtk/nsAppShell.cpp
index d87d80b2505..88f554ccf65 100644
--- a/mozilla/widget/src/gtk/nsAppShell.cpp
+++ b/mozilla/widget/src/gtk/nsAppShell.cpp
@@ -47,7 +47,6 @@ nsAppShell::nsAppShell()
 {
   mRefCnt = 0;
   mDispatchListener = 0;
-  mSelectionMgr = 0;
 }
 
 //-------------------------------------------------------------------------
@@ -254,9 +253,5 @@ NS_METHOD nsAppShell::EventIsForModalWindow(PRBool aRealEvent, void *aEvent,
   return NS_OK;
 }
 
-NS_METHOD
-nsAppShell::GetSelectionMgr(nsISelectionMgr** aSelectionMgr)
-{
-  return NS_OK;
-}
+
 
diff --git a/mozilla/widget/src/gtk/nsAppShell.h b/mozilla/widget/src/gtk/nsAppShell.h
index e94dbddf279..108ac4aad5e 100644
--- a/mozilla/widget/src/gtk/nsAppShell.h
+++ b/mozilla/widget/src/gtk/nsAppShell.h
@@ -49,11 +49,9 @@ class nsAppShell : public nsIAppShell
     NS_IMETHOD		Exit();
     NS_IMETHOD		SetDispatchListener(nsDispatchListener* aDispatchListener);
     virtual void*	GetNativeData(PRUint32 aDataType);
-    NS_IMETHOD GetSelectionMgr(nsISelectionMgr** aSelectionMgr);
 
   private:
     nsDispatchListener	*mDispatchListener;
-    nsISelectionMgr     *mSelectionMgr;
 
   protected:
       nsIEventQueueService * mEventQService;
diff --git a/mozilla/widget/src/photon/nsAppShell.cpp b/mozilla/widget/src/photon/nsAppShell.cpp
index af9f140c32f..a8c3d3ed3a0 100644
--- a/mozilla/widget/src/photon/nsAppShell.cpp
+++ b/mozilla/widget/src/photon/nsAppShell.cpp
@@ -32,7 +32,6 @@ nsAppShell::nsAppShell()
 { 
   NS_INIT_REFCNT();
   mDispatchListener = 0;
-  mSelectionMgr = 0;
   mEventBufferSz = sizeof( PhEvent_t ) + 1000;
   mEvent = (PhEvent_t*) malloc( mEventBufferSz );
   NS_ASSERTION( mEvent, "Out of memory" );
@@ -48,10 +47,6 @@ nsAppShell::nsAppShell()
 
 NS_METHOD nsAppShell::Create(int* argc, char ** argv)
 {
-  // Create the selection manager
-//  if( !mSelectionMgr )
-//    NS_NewSelectionMgr( &mSelectionMgr );
-
   return NS_OK;
 }
 
@@ -208,7 +203,6 @@ NS_METHOD nsAppShell::Exit()
 //-------------------------------------------------------------------------
 nsAppShell::~nsAppShell()
 {
-//  NS_IF_RELEASE(mSelectionMgr);
 }
 
 //-------------------------------------------------------------------------
@@ -225,9 +219,4 @@ void* nsAppShell::GetNativeData(PRUint32 aDataType)
   return nsnull;
 }
 
-NS_METHOD nsAppShell::GetSelectionMgr(nsISelectionMgr** aSelectionMgr)
-{
-
-  return NS_OK;
-}
 
diff --git a/mozilla/widget/src/photon/nsAppShell.h b/mozilla/widget/src/photon/nsAppShell.h
index d711d8ec22d..4f4109cb1c6 100644
--- a/mozilla/widget/src/photon/nsAppShell.h
+++ b/mozilla/widget/src/photon/nsAppShell.h
@@ -43,7 +43,6 @@ class nsAppShell : public nsIAppShell
     NS_IMETHOD        SetDispatchListener(nsDispatchListener* aDispatchListener);
     NS_IMETHOD        Exit();
     virtual void*     GetNativeData(PRUint32 aDataType);
-    NS_IMETHOD        GetSelectionMgr(nsISelectionMgr** aSelectionMgr);
 
     // XXX temporary for Dialog investigation
 
@@ -53,7 +52,6 @@ class nsAppShell : public nsIAppShell
   private:
 
     nsDispatchListener   *mDispatchListener;
-    nsISelectionMgr      *mSelectionMgr;
     unsigned long        mEventBufferSz;
     PhEvent_t            *mEvent;
 };
diff --git a/mozilla/widget/src/xlib/Makefile.in b/mozilla/widget/src/xlib/Makefile.in
index af824de76d1..71f3954b622 100644
--- a/mozilla/widget/src/xlib/Makefile.in
+++ b/mozilla/widget/src/xlib/Makefile.in
@@ -61,7 +61,7 @@ CPPSRCS= nsWidgetFactory.cpp \
 	nsMenu.cpp \
 	nsMenuItem.cpp \
 	nsPopUpMenu.cpp \
-	nsSelectionMgr.cpp
+	$(NULL)
 
 TARGETS = $(LIBRARY)
 
diff --git a/mozilla/widget/src/xlib/nsAppShell.cpp b/mozilla/widget/src/xlib/nsAppShell.cpp
index e768535ec9e..6db23aef596 100644
--- a/mozilla/widget/src/xlib/nsAppShell.cpp
+++ b/mozilla/widget/src/xlib/nsAppShell.cpp
@@ -222,8 +222,3 @@ void* nsAppShell::GetNativeData(PRUint32 aDataType)
   return nsnull;
 }
 
-NS_METHOD
-nsAppShell::GetSelectionMgr(nsISelectionMgr** aSelectionMgr)
-{
-  return NS_OK;
-}
diff --git a/mozilla/widget/src/xlib/nsAppShell.h b/mozilla/widget/src/xlib/nsAppShell.h
index cf40e813bfd..db28c69063f 100644
--- a/mozilla/widget/src/xlib/nsAppShell.h
+++ b/mozilla/widget/src/xlib/nsAppShell.h
@@ -46,11 +46,10 @@ class nsAppShell : public nsIAppShell
   NS_IMETHOD            SetDispatchListener(nsDispatchListener* aDispatchListener);
   NS_IMETHOD            Exit();
   virtual void *        GetNativeData(PRUint32 aDataType);
-  NS_IMETHOD            GetSelectionMgr(nsISelectionMgr** aSelectionMgr);
   
  private:
   nsDispatchListener*     mDispatchListener;
-  nsISelectionMgr         *mSelectionMgr;
+
 protected:
   nsIEventQueueService * mEventQueueService;
 };