diff --git a/htmlparser/macbuild/htmlparser.mcp b/htmlparser/macbuild/htmlparser.mcp
index 96cd98ca8b1..2142217efaf 100644
Binary files a/htmlparser/macbuild/htmlparser.mcp and b/htmlparser/macbuild/htmlparser.mcp differ
diff --git a/htmlparser/src/MANIFEST b/htmlparser/src/MANIFEST
index 45bd0825e48..74448aa8e38 100644
--- a/htmlparser/src/MANIFEST
+++ b/htmlparser/src/MANIFEST
@@ -7,7 +7,6 @@ nsIContentSink.h
 nsIHTMLContentSink.h
 nsIHTMLFragmentContentSink.h
 nsHTMLContentSinkStream.h
-nsHTMLToTXTSinkStream.h
 nsITokenizer.h
 nsHTMLTokens.h
 nsIParserNode.h
diff --git a/htmlparser/src/Makefile.in b/htmlparser/src/Makefile.in
index d13c46375d6..924d70638b8 100644
--- a/htmlparser/src/Makefile.in
+++ b/htmlparser/src/Makefile.in
@@ -73,7 +73,6 @@ CPPSRCS		= \
 		nsToken.cpp \
 		nsTokenHandler.cpp \
 		nsHTMLContentSinkStream.cpp \
-		nsHTMLToTXTSinkStream.cpp \
 		nsValidDTD.cpp \
 		nsWellFormedDTD.cpp \
 		nsViewSourceHTML.cpp \
@@ -97,7 +96,6 @@ EXPORTS		= \
 		nsIHTMLContentSink.h \
 		nsHTMLContentSinkStream.h \
 		nsIHTMLFragmentContentSink.h \
-		nsHTMLToTXTSinkStream.h \
 		nsHTMLEntities.h \
 		nsHTMLEntityList.h \
 		nsHTMLTags.h \
diff --git a/htmlparser/src/makefile.win b/htmlparser/src/makefile.win
index 6402c746ef3..5eba3be0d9e 100644
--- a/htmlparser/src/makefile.win
+++ b/htmlparser/src/makefile.win
@@ -50,7 +50,6 @@ CPPSRCS=					\
 	nsToken.cpp				\
 	nsTokenHandler.cpp			\
 	nsHTMLContentSinkStream.cpp		\
-	nsHTMLToTXTSinkStream.cpp		\
 	nsValidDTD.cpp				\
 	nsWellFormedDTD.cpp			\
 	nsViewSourceHTML.cpp \
@@ -79,7 +78,6 @@ CPP_OBJS=					\
 	.\$(OBJDIR)\nsToken.obj			\
 	.\$(OBJDIR)\nsTokenHandler.obj		\
 	.\$(OBJDIR)\nsHTMLContentSinkStream.obj	\
-	.\$(OBJDIR)\nsHTMLToTXTSinkStream.obj	\
 	.\$(OBJDIR)\nsValidDTD.obj		\
 	.\$(OBJDIR)\nsWellFormedDTD.obj		\
 	.\$(OBJDIR)\nsViewSourceHTML.obj		\
@@ -96,7 +94,6 @@ EXPORTS=					\
 	nsILoggingSink.h			\
 	nsHTMLContentSinkStream.h		\
 	nsIHTMLFragmentContentSink.h		\
-	nsHTMLToTXTSinkStream.h		\
 	nsHTMLEntities.h			\
 	nsHTMLEntityList.h			\
 	nsHTMLTags.h				\
diff --git a/htmlparser/src/nsParserCIID.h b/htmlparser/src/nsParserCIID.h
index 20994e396b1..81281c3d06f 100644
--- a/htmlparser/src/nsParserCIID.h
+++ b/htmlparser/src/nsParserCIID.h
@@ -75,10 +75,6 @@
 #define NS_HTMLCONTENTSINKSTREAM_CID \
 { 0xa6cf910f, 0x15b3, 0x11d2, { 0x93, 0x2e, 0x0, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
 
-// {a6cf9110-15b3-11d2-932e-00805f8add32}
-#define NS_HTMLTOTXTSINKSTREAM_CID \
-{ 0xa6cf9110, 0x15b3, 0x11d2, { 0x93, 0x2e, 0x0, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
-
 // {a6cf9112-15b3-11d2-932e-00805f8add32}
 #define NS_PARSERSERVICE_CID \
 { 0xa6cf9112, 0x15b3, 0x11d2, { 0x93, 0x2e, 0x0, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
diff --git a/htmlparser/src/nsParserModule.cpp b/htmlparser/src/nsParserModule.cpp
index c132d5f0c80..0e6b59ebf15 100644
--- a/htmlparser/src/nsParserModule.cpp
+++ b/htmlparser/src/nsParserModule.cpp
@@ -35,7 +35,6 @@
 #include "COtherDTD.h"
 #include "nsViewSourceHTML.h"
 #include "nsHTMLContentSinkStream.h"
-#include "nsHTMLToTXTSinkStream.h"
 #include "nsHTMLEntities.h"
 #include "nsHTMLTokenizer.h"
 #include "nsXMLTokenizer.h"
@@ -143,7 +142,6 @@ static NS_DEFINE_CID(kCOtherDTDCID, NS_COTHER_DTD_CID);
 static NS_DEFINE_CID(kCTransitionalDTDCID, NS_CTRANSITIONAL_DTD_CID);
 static NS_DEFINE_CID(kViewSourceDTDCID, NS_VIEWSOURCE_DTD_CID);
 static NS_DEFINE_CID(kHTMLContentSinkStreamCID, NS_HTMLCONTENTSINKSTREAM_CID);
-static NS_DEFINE_CID(kHTMLToTXTSinkStreamCID, NS_HTMLTOTXTSINKSTREAM_CID);
 static NS_DEFINE_CID(kParserServiceCID, NS_PARSERSERVICE_CID);
 
 struct Components {
@@ -160,7 +158,6 @@ static Components gComponents[] = {
   { "Transitional DTD", &kCTransitionalDTDCID },
   { "ViewSource DTD", &kViewSourceDTDCID },
   { "HTML Content Sink Stream", &kHTMLContentSinkStreamCID },
-  { "HTML To Text Sink Stream", &kHTMLToTXTSinkStreamCID },
   { "ParserService", &kParserServiceCID },
 };
 
@@ -174,7 +171,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(COtherDTD)
 NS_GENERIC_FACTORY_CONSTRUCTOR(CTransitionalDTD)
 NS_GENERIC_FACTORY_CONSTRUCTOR(CViewSourceHTML)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLContentSinkStream)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLToTXTSinkStream)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsParserService)
 
 //----------------------------------------------------------------------
@@ -203,7 +199,6 @@ protected:
   nsCOMPtr<nsIGenericFactory> mTransitionalHTMLDTDFactory;
   nsCOMPtr<nsIGenericFactory> mViewSourceHTMLDTDFactory;
   nsCOMPtr<nsIGenericFactory> mHTMLContentSinkStreamFactory;
-  nsCOMPtr<nsIGenericFactory> mHTMLToTXTSinkStreamFactory;
   nsCOMPtr<nsIGenericFactory> mParserServiceFactory;
 };
 
@@ -323,13 +318,6 @@ nsParserModule::GetClassObject(nsIComponentManager *aCompMgr,
     }
     fact = mHTMLContentSinkStreamFactory;
   }
-  else if (aClass.Equals(kHTMLToTXTSinkStreamCID)) {
-    if (!mHTMLToTXTSinkStreamFactory) {
-      rv = NS_NewGenericFactory(getter_AddRefs(mHTMLToTXTSinkStreamFactory), 
-                                &nsHTMLToTXTSinkStreamConstructor);
-    }
-    fact = mHTMLToTXTSinkStreamFactory;
-  }
   else if (aClass.Equals(kParserServiceCID)) {
     if (!mParserServiceFactory) {
       rv = NS_NewGenericFactory(getter_AddRefs(mParserServiceFactory), 
diff --git a/parser/htmlparser/macbuild/htmlparser.mcp b/parser/htmlparser/macbuild/htmlparser.mcp
index 96cd98ca8b1..2142217efaf 100644
Binary files a/parser/htmlparser/macbuild/htmlparser.mcp and b/parser/htmlparser/macbuild/htmlparser.mcp differ
diff --git a/parser/htmlparser/src/MANIFEST b/parser/htmlparser/src/MANIFEST
index 45bd0825e48..74448aa8e38 100644
--- a/parser/htmlparser/src/MANIFEST
+++ b/parser/htmlparser/src/MANIFEST
@@ -7,7 +7,6 @@ nsIContentSink.h
 nsIHTMLContentSink.h
 nsIHTMLFragmentContentSink.h
 nsHTMLContentSinkStream.h
-nsHTMLToTXTSinkStream.h
 nsITokenizer.h
 nsHTMLTokens.h
 nsIParserNode.h
diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in
index d13c46375d6..924d70638b8 100644
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -73,7 +73,6 @@ CPPSRCS		= \
 		nsToken.cpp \
 		nsTokenHandler.cpp \
 		nsHTMLContentSinkStream.cpp \
-		nsHTMLToTXTSinkStream.cpp \
 		nsValidDTD.cpp \
 		nsWellFormedDTD.cpp \
 		nsViewSourceHTML.cpp \
@@ -97,7 +96,6 @@ EXPORTS		= \
 		nsIHTMLContentSink.h \
 		nsHTMLContentSinkStream.h \
 		nsIHTMLFragmentContentSink.h \
-		nsHTMLToTXTSinkStream.h \
 		nsHTMLEntities.h \
 		nsHTMLEntityList.h \
 		nsHTMLTags.h \
diff --git a/parser/htmlparser/src/makefile.win b/parser/htmlparser/src/makefile.win
index 6402c746ef3..5eba3be0d9e 100644
--- a/parser/htmlparser/src/makefile.win
+++ b/parser/htmlparser/src/makefile.win
@@ -50,7 +50,6 @@ CPPSRCS=					\
 	nsToken.cpp				\
 	nsTokenHandler.cpp			\
 	nsHTMLContentSinkStream.cpp		\
-	nsHTMLToTXTSinkStream.cpp		\
 	nsValidDTD.cpp				\
 	nsWellFormedDTD.cpp			\
 	nsViewSourceHTML.cpp \
@@ -79,7 +78,6 @@ CPP_OBJS=					\
 	.\$(OBJDIR)\nsToken.obj			\
 	.\$(OBJDIR)\nsTokenHandler.obj		\
 	.\$(OBJDIR)\nsHTMLContentSinkStream.obj	\
-	.\$(OBJDIR)\nsHTMLToTXTSinkStream.obj	\
 	.\$(OBJDIR)\nsValidDTD.obj		\
 	.\$(OBJDIR)\nsWellFormedDTD.obj		\
 	.\$(OBJDIR)\nsViewSourceHTML.obj		\
@@ -96,7 +94,6 @@ EXPORTS=					\
 	nsILoggingSink.h			\
 	nsHTMLContentSinkStream.h		\
 	nsIHTMLFragmentContentSink.h		\
-	nsHTMLToTXTSinkStream.h		\
 	nsHTMLEntities.h			\
 	nsHTMLEntityList.h			\
 	nsHTMLTags.h				\
diff --git a/parser/htmlparser/src/nsParserCIID.h b/parser/htmlparser/src/nsParserCIID.h
index 20994e396b1..81281c3d06f 100644
--- a/parser/htmlparser/src/nsParserCIID.h
+++ b/parser/htmlparser/src/nsParserCIID.h
@@ -75,10 +75,6 @@
 #define NS_HTMLCONTENTSINKSTREAM_CID \
 { 0xa6cf910f, 0x15b3, 0x11d2, { 0x93, 0x2e, 0x0, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
 
-// {a6cf9110-15b3-11d2-932e-00805f8add32}
-#define NS_HTMLTOTXTSINKSTREAM_CID \
-{ 0xa6cf9110, 0x15b3, 0x11d2, { 0x93, 0x2e, 0x0, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
-
 // {a6cf9112-15b3-11d2-932e-00805f8add32}
 #define NS_PARSERSERVICE_CID \
 { 0xa6cf9112, 0x15b3, 0x11d2, { 0x93, 0x2e, 0x0, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
diff --git a/parser/htmlparser/src/nsParserModule.cpp b/parser/htmlparser/src/nsParserModule.cpp
index c132d5f0c80..0e6b59ebf15 100644
--- a/parser/htmlparser/src/nsParserModule.cpp
+++ b/parser/htmlparser/src/nsParserModule.cpp
@@ -35,7 +35,6 @@
 #include "COtherDTD.h"
 #include "nsViewSourceHTML.h"
 #include "nsHTMLContentSinkStream.h"
-#include "nsHTMLToTXTSinkStream.h"
 #include "nsHTMLEntities.h"
 #include "nsHTMLTokenizer.h"
 #include "nsXMLTokenizer.h"
@@ -143,7 +142,6 @@ static NS_DEFINE_CID(kCOtherDTDCID, NS_COTHER_DTD_CID);
 static NS_DEFINE_CID(kCTransitionalDTDCID, NS_CTRANSITIONAL_DTD_CID);
 static NS_DEFINE_CID(kViewSourceDTDCID, NS_VIEWSOURCE_DTD_CID);
 static NS_DEFINE_CID(kHTMLContentSinkStreamCID, NS_HTMLCONTENTSINKSTREAM_CID);
-static NS_DEFINE_CID(kHTMLToTXTSinkStreamCID, NS_HTMLTOTXTSINKSTREAM_CID);
 static NS_DEFINE_CID(kParserServiceCID, NS_PARSERSERVICE_CID);
 
 struct Components {
@@ -160,7 +158,6 @@ static Components gComponents[] = {
   { "Transitional DTD", &kCTransitionalDTDCID },
   { "ViewSource DTD", &kViewSourceDTDCID },
   { "HTML Content Sink Stream", &kHTMLContentSinkStreamCID },
-  { "HTML To Text Sink Stream", &kHTMLToTXTSinkStreamCID },
   { "ParserService", &kParserServiceCID },
 };
 
@@ -174,7 +171,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(COtherDTD)
 NS_GENERIC_FACTORY_CONSTRUCTOR(CTransitionalDTD)
 NS_GENERIC_FACTORY_CONSTRUCTOR(CViewSourceHTML)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLContentSinkStream)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLToTXTSinkStream)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsParserService)
 
 //----------------------------------------------------------------------
@@ -203,7 +199,6 @@ protected:
   nsCOMPtr<nsIGenericFactory> mTransitionalHTMLDTDFactory;
   nsCOMPtr<nsIGenericFactory> mViewSourceHTMLDTDFactory;
   nsCOMPtr<nsIGenericFactory> mHTMLContentSinkStreamFactory;
-  nsCOMPtr<nsIGenericFactory> mHTMLToTXTSinkStreamFactory;
   nsCOMPtr<nsIGenericFactory> mParserServiceFactory;
 };
 
@@ -323,13 +318,6 @@ nsParserModule::GetClassObject(nsIComponentManager *aCompMgr,
     }
     fact = mHTMLContentSinkStreamFactory;
   }
-  else if (aClass.Equals(kHTMLToTXTSinkStreamCID)) {
-    if (!mHTMLToTXTSinkStreamFactory) {
-      rv = NS_NewGenericFactory(getter_AddRefs(mHTMLToTXTSinkStreamFactory), 
-                                &nsHTMLToTXTSinkStreamConstructor);
-    }
-    fact = mHTMLToTXTSinkStreamFactory;
-  }
   else if (aClass.Equals(kParserServiceCID)) {
     if (!mParserServiceFactory) {
       rv = NS_NewGenericFactory(getter_AddRefs(mParserServiceFactory), 
diff --git a/xpcom/base/IIDS.h b/xpcom/base/IIDS.h
index 470454b27c4..00875d7bdf1 100644
--- a/xpcom/base/IIDS.h
+++ b/xpcom/base/IIDS.h
@@ -1136,12 +1136,6 @@ nsIDOMNSLocation = { /* a6cf9108-15b3-11d2-932e-00805f8add32 */
     0x11d2,
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}
   };
-nsTextConverter = { /* a6cf9109-15b3-11d2-932e-00805f8add32 */
-    0xa6cf9109,
-    0x15b3,
-    0x11d2,
-    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}
-  };
 nsIDOMDOMException = { /* a6cf910a-15b3-11d2-932e-00805f8add32 */
     0xa6cf910a,
     0x15b3,
@@ -1178,12 +1172,6 @@ nsHTMLContentSinkStream_CID = { /* a6cf910f-15b3-11d2-932e-00805f8add32 */
     0x11d2,
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}
   };
-nsHTMLToTXTSinkStream_CID = { /* a6cf9110-15b3-11d2-932e-00805f8add32 */
-    0xa6cf9110,
-    0x15b3,
-    0x11d2,
-    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}
-  };
 nsIParserService = { /* a6cf9111-15b3-11d2-932e-00805f8add32 */
     0xa6cf9111,
     0x15b3,