diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 90b32fb0dbf8..a4fdd67b8862 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -7033,13 +7033,6 @@ PresShell::DoReflow(nsIFrame* target, PRBool aInterruptible)
 void
 PresShell::DoVerifyReflow()
 {
-  if (nsIFrameDebug::GetVerifyTreeEnable()) {
-    nsIFrame* rootFrame = FrameManager()->GetRootFrame();
-    nsIFrameDebug *frameDebug = do_QueryFrame(rootFrame);
-    if (frameDebug) {
-      frameDebug->VerifyTree();
-    }
-  }
   if (GetVerifyReflowEnable()) {
     // First synchronously render what we have so far so that we can
     // see it.
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 825079e8009a..e00d1374ed8a 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -6395,21 +6395,6 @@ nsBlockFrame::ChildIsDirty(nsIFrame* aChild)
   nsBlockFrameSuper::ChildIsDirty(aChild);
 }
 
-//////////////////////////////////////////////////////////////////////
-// Start Debugging
-
-#ifdef NS_DEBUG
-NS_IMETHODIMP
-nsBlockFrame::VerifyTree() const
-{
-  // XXX rewrite this
-  return NS_OK;
-}
-#endif
-
-// End Debugging
-//////////////////////////////////////////////////////////////////////
-
 NS_IMETHODIMP
 nsBlockFrame::Init(nsIContent*      aContent,
                    nsIFrame*        aParent,
diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h
index 0541dea69309..af7e667ee26c 100644
--- a/layout/generic/nsBlockFrame.h
+++ b/layout/generic/nsBlockFrame.h
@@ -196,7 +196,6 @@ public:
   NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
   NS_IMETHOD_(nsFrameState) GetDebugStateBits() const;
   NS_IMETHOD GetFrameName(nsAString& aResult) const;
-  NS_IMETHOD VerifyTree() const;
 #endif
 
 #ifdef ACCESSIBILITY
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 936766a43379..b0710d00759b 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -202,28 +202,6 @@ PRBool nsIFrameDebug::GetShowEventTargetFrameBorder()
  */
 static PRLogModuleInfo* gLogModule;
 
-static PRLogModuleInfo* gFrameVerifyTreeLogModuleInfo;
-
-static PRBool gFrameVerifyTreeEnable = PRBool(0x55);
-
-PRBool
-nsIFrameDebug::GetVerifyTreeEnable()
-{
-  if (gFrameVerifyTreeEnable == PRBool(0x55)) {
-    if (nsnull == gFrameVerifyTreeLogModuleInfo) {
-      gFrameVerifyTreeLogModuleInfo = PR_NewLogModule("frameverifytree");
-      gFrameVerifyTreeEnable = 0 != gFrameVerifyTreeLogModuleInfo->level;
-    }
-  }
-  return gFrameVerifyTreeEnable;
-}
-
-void
-nsIFrameDebug::SetVerifyTreeEnable(PRBool aEnabled)
-{
-  gFrameVerifyTreeEnable = aEnabled;
-}
-
 static PRLogModuleInfo* gStyleVerifyTreeLogModuleInfo;
 
 static PRBool gStyleVerifyTreeEnable = PRBool(0x55);
@@ -4479,13 +4457,6 @@ nsFrame::DumpBaseRegressionData(nsPresContext* aPresContext, FILE* out, PRInt32
     list = GetAdditionalChildListName(listIndex++);
   } while (nsnull != list);
 }
-
-NS_IMETHODIMP
-nsFrame::VerifyTree() const
-{
-  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
-  return NS_OK;
-}
 #endif
 
 /*this method may.. invalidate if the state was changed or if aForceRedraw is PR_TRUE
diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h
index e0b12066f86b..80e0f8abe750 100644
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -235,7 +235,6 @@ public:
   NS_IMETHOD  GetFrameName(nsAString& aResult) const;
   NS_IMETHOD_(nsFrameState) GetDebugStateBits() const;
   NS_IMETHOD  DumpRegressionData(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent);
-  NS_IMETHOD  VerifyTree() const;
 #endif
 
   NS_IMETHOD  SetSelected(nsPresContext* aPresContext, nsIDOMRange *aRange,PRBool aSelected, nsSpread aSpread, SelectionType aType);
diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp
index bb9a9896fa08..b2e86b058e94 100644
--- a/layout/generic/nsFrameFrame.cpp
+++ b/layout/generic/nsFrameFrame.cpp
@@ -180,8 +180,6 @@ public:
   NS_IMETHOD BeginSwapDocShells(nsIFrame* aOther);
   virtual void EndSwapDocShells(nsIFrame* aOther);
 
-  NS_IMETHOD  VerifyTree() const;
-
   // nsIReflowCallback
   virtual PRBool ReflowFinished();
   virtual void ReflowCallbackCanceled();
@@ -646,14 +644,6 @@ nsSubDocumentFrame::ReflowCallbackCanceled()
   mPostedReflowCallback = PR_FALSE;
 }
 
-NS_IMETHODIMP
-nsSubDocumentFrame::VerifyTree() const
-{
-  // XXX Completely disabled for now; once pseud-frames are reworked
-  // then we can turn it back on.
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsSubDocumentFrame::AttributeChanged(PRInt32 aNameSpaceID,
                                      nsIAtom* aAttribute,
diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp
index 549153b83aa4..e1e40364be6b 100644
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -1467,15 +1467,6 @@ nsHTMLFramesetFrame::SetBorderResize(PRInt32*                   aChildTypes,
   }
 }
   
-        
-NS_IMETHODIMP
-nsHTMLFramesetFrame::VerifyTree() const
-{
-  // XXX Completely disabled for now; once pseud-frames are reworked
-  // then we can turn it back on.
-  return NS_OK;
-}
-
 void
 nsHTMLFramesetFrame::StartMouseDrag(nsPresContext*            aPresContext, 
                                     nsHTMLFramesetBorderFrame* aBorder, 
diff --git a/layout/generic/nsFrameSetFrame.h b/layout/generic/nsFrameSetFrame.h
index d7e77eff0f4b..104e599cb27a 100644
--- a/layout/generic/nsFrameSetFrame.h
+++ b/layout/generic/nsFrameSetFrame.h
@@ -152,8 +152,6 @@ public:
 
   virtual PRBool IsLeaf() const;
   
-  NS_IMETHOD  VerifyTree() const;
-
   void StartMouseDrag(nsPresContext*            aPresContext, 
                       nsHTMLFramesetBorderFrame* aBorder, 
                       nsGUIEvent*                aEvent);
diff --git a/layout/generic/nsIFrameDebug.h b/layout/generic/nsIFrameDebug.h
index 46d8a9de7734..23188c2cdef9 100644
--- a/layout/generic/nsIFrameDebug.h
+++ b/layout/generic/nsIFrameDebug.h
@@ -80,21 +80,6 @@ public:
    */
   NS_IMETHOD  DumpRegressionData(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent) = 0;
 
-  NS_IMETHOD  VerifyTree() const = 0;
-
-  /**
-   * See if tree verification is enabled. To enable tree verification add
-   * "frameverifytree:1" to your NSPR_LOG_MODULES environment variable
-   * (any non-zero debug level will work). Or, call SetVerifyTreeEnable
-   * with PR_TRUE.
-   */
-  static PRBool GetVerifyTreeEnable();
-
-  /**
-   * Set the verify-tree enable flag.
-   */
-  static void SetVerifyTreeEnable(PRBool aEnabled);
-
   /**
    * See if style tree verification is enabled. To enable style tree 
    * verification add "styleverifytree:1" to your NSPR_LOG_MODULES 
diff --git a/layout/tables/nsTableOuterFrame.cpp b/layout/tables/nsTableOuterFrame.cpp
index 5c172e3c68aa..577d0f43182f 100644
--- a/layout/tables/nsTableOuterFrame.cpp
+++ b/layout/tables/nsTableOuterFrame.cpp
@@ -1283,13 +1283,6 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext*           aPresContext,
   return rv;
 }
 
-#ifdef NS_DEBUG
-NS_METHOD nsTableOuterFrame::VerifyTree() const
-{
-  return NS_OK;
-}
-#endif
-
 nsIAtom*
 nsTableOuterFrame::GetType() const
 {
diff --git a/layout/tables/nsTableOuterFrame.h b/layout/tables/nsTableOuterFrame.h
index 00b721517d17..0fa567ff2677 100644
--- a/layout/tables/nsTableOuterFrame.h
+++ b/layout/tables/nsTableOuterFrame.h
@@ -205,13 +205,6 @@ protected:
     * @see nsHTMLContainerFrame::GetSkipSides */
   virtual PRIntn GetSkipSides() const;
 
-#ifdef NS_DEBUG
-  /** overridden here to handle special caption-table relationship
-    * @see nsContainerFrame::VerifyTree
-    */
-  NS_IMETHOD VerifyTree() const;
-#endif
-
   PRUint8 GetCaptionSide(); // NS_STYLE_CAPTION_SIDE_* or NO_SIDE
 
   PRBool HasSideCaption() {