diff --git a/mozilla/editor/composer/src/Makefile.in b/mozilla/editor/composer/src/Makefile.in
index d8dba54afca..9fcf5690174 100644
--- a/mozilla/editor/composer/src/Makefile.in
+++ b/mozilla/editor/composer/src/Makefile.in
@@ -62,7 +62,6 @@ REQUIRES	= xpcom \
 
 CPPSRCS  = \
            nsComposeTxtSrvFilter.cpp            \
-           nsEditorParserObserver.cpp     \
            nsComposerController.cpp       \
            nsComposerCommands.cpp         \
            nsComposerDocumentCommands.cpp \
diff --git a/mozilla/editor/composer/src/nsEditingSession.cpp b/mozilla/editor/composer/src/nsEditingSession.cpp
index 6ec427212e3..bd2d3e7b9f5 100644
--- a/mozilla/editor/composer/src/nsEditingSession.cpp
+++ b/mozilla/editor/composer/src/nsEditingSession.cpp
@@ -80,8 +80,6 @@
 #include "imgIContainer.h"
 #include "nsIPresContext.h"
 
-#include "nsEditorParserObserver.h"
-
 #if DEBUG
 //#define NOISY_DOC_LOADING  1
 #endif
@@ -268,17 +266,6 @@ const char* const gSupportedTextTypes[] = {
   NULL      // IMPORTANT! Null must be at end
 };
 
-// Elements that editor cannot currently support (11/11/02),
-//   but hopefully we will be able to soon.
-#ifndef FULL_EDITOR_HTML_SUPPORT
-static eHTMLTags gWatchTags[] = 
-{ eHTMLTag_frameset,
-  eHTMLTag_iframe,
-  eHTMLTag_unknown
-};
-#endif
-
-
 PRBool
 IsSupportedTextType(const char* aMIMEType)
 {
diff --git a/mozilla/editor/composer/src/nsEditingSession.h b/mozilla/editor/composer/src/nsEditingSession.h
index ed58a6436d6..ba26c012a51 100644
--- a/mozilla/editor/composer/src/nsEditingSession.h
+++ b/mozilla/editor/composer/src/nsEditingSession.h
@@ -74,11 +74,6 @@ class nsIWebProgress;
 class nsIEditorDocShell;
 class nsIChannel;
 
-#ifndef FULL_EDITOR_HTML_SUPPORT
-class nsEditorParserObserver;
-#endif
-
-
 class nsComposerCommandsUpdater;
 
 class nsEditingSession : public nsIEditingSession,