diff --git a/parser/htmlparser/public/nsHTMLTokens.h b/parser/htmlparser/public/nsHTMLTokens.h
index 9c4fff8c556..c970369598f 100644
--- a/parser/htmlparser/public/nsHTMLTokens.h
+++ b/parser/htmlparser/public/nsHTMLTokens.h
@@ -76,26 +76,6 @@ enum eHTMLTokenTypes {
   eToken_last //make sure this stays the last token...
 };
 
-enum eHTMLCategory {
-  eHTMLCategory_unknown=0,
-  eHTMLCategory_inline,
-  eHTMLCategory_block,
-  eHTMLCategory_blockAndInline,
-  eHTMLCategory_list,
-  eHTMLCategory_table,
-  eHTMLCategory_tablepart,
-  eHTMLCategory_tablerow,
-  eHTMLCategory_tabledata,
-  eHTMLCategory_head,
-  eHTMLCategory_html,
-  eHTMLCategory_body,
-  eHTMLCategory_form,
-  eHTMLCategory_options,
-  eHTMLCategory_frameset,
-  eHTMLCategory_text
-};
-
-
 nsresult      ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScanner);
 nsresult      ConsumeAttributeText(PRUnichar aChar,nsString& aString,nsScanner& aScanner);
 const PRUnichar* GetTagName(PRInt32 aTag);
@@ -382,9 +362,6 @@ public:
 
   PRPackedBool mHasEqualWithoutValue;
 protected:
-#ifdef DEBUG
-  PRPackedBool mLastAttribute;
-#endif
   nsScannerSharedSubstring mTextValue;
   nsScannerSubstring mTextKey;
 };
diff --git a/parser/htmlparser/src/nsHTMLTokens.cpp b/parser/htmlparser/src/nsHTMLTokens.cpp
index 3c502d258a5..32e6cef0e99 100644
--- a/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -1690,9 +1690,6 @@ nsresult CNewlineToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFl
  */
 CAttributeToken::CAttributeToken() : CHTMLToken(eHTMLTag_unknown) {
   mHasEqualWithoutValue=PR_FALSE;
-#ifdef DEBUG
-  mLastAttribute = PR_FALSE;
-#endif
 }
 
 /*
@@ -1705,9 +1702,6 @@ CAttributeToken::CAttributeToken() : CHTMLToken(eHTMLTag_unknown) {
 CAttributeToken::CAttributeToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
   mTextValue.writable().Assign(aName);
   mHasEqualWithoutValue=PR_FALSE;
-#ifdef DEBUG
-  mLastAttribute = PR_FALSE;
-#endif
 }
 
 /*
@@ -1722,9 +1716,6 @@ CAttributeToken::CAttributeToken(const nsAString& aKey, const nsAString& aName)
   mTextValue.writable().Assign(aName);
   mTextKey.Rebind(aKey);
   mHasEqualWithoutValue=PR_FALSE;
-#ifdef DEBUG
-  mLastAttribute = PR_FALSE;
-#endif
 }
 
 /*
@@ -2044,11 +2035,6 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner, PRInt32
         //numbering right.
         return NS_ERROR_HTMLPARSER_BADATTRIBUTE;
       }
-
-#ifdef DEBUG
-      result = aScanner.Peek(aChar);
-      mLastAttribute = (kGreaterThan == aChar || kEOF == result);
-#endif
     }
   }//if