diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 7982cdd8def..6b05f7b6263 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -3244,6 +3244,9 @@ NS_IMETHODIMP nsDocShell::GetRootScrollableView(nsIScrollableView** aOutScrollVi
    NS_ENSURE_SUCCESS(viewManager->GetRootScrollableView(aOutScrollView),
       NS_ERROR_FAILURE);
 
+   NS_ASSERTION(*aOutScrollView, "no scroll view");
+   if (!*aOutScrollView) return NS_ERROR_FAILURE;
+
    return NS_OK;
 } 
 
diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp
index d0adf4aaedf..ffcb5b04582 100644
--- a/mozilla/profile/src/nsProfile.cpp
+++ b/mozilla/profile/src/nsProfile.cpp
@@ -613,16 +613,6 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
         }
     }
 
-/* hack so we don't do this for tinderbox.  otherwise the tree goes orange */
-#if !defined(DEBUG_cltbld) && !defined(MOZ_BYPASS_PROFILE_AT_STARTUP) && !defined(DEBUG_pavlov)
-#ifdef DEBUG
-    if (profileURLStr.Length() == 0) {
-        printf("DEBUG BUILDS ONLY:  we are forcing you to use the profile manager to help smoke test it.\n");
-        profileURLStr = PROFILE_MANAGER_URL;
-    }
-#endif /* DEBUG */
-#endif /* !DEBUG_cltbld && !MOZ_BYPASS_PROFILE_AT_STARTUP */
-
 #ifdef DEBUG_profile
     printf("Profile Manager : Command Line Options : End\n");
 #endif
diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
index 9c991544e7a..c7e0eb0c457 100644
--- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
+++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
@@ -125,13 +125,6 @@ static NS_DEFINE_CID(kDocumentCharsetInfoCID, NS_DOCUMENTCHARSETINFO_CID);
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 
 
-#ifdef DEBUG
-#ifndef DEBUG_pavlov
-#define FORCE_CHECKIN_GUIDELINES
-#endif /* DEBUG_pavlov */
-#endif /* DEBUG */
-
-
 // Stuff to implement find/findnext
 #include "nsIFindComponent.h"
 #ifdef DEBUG_warren
@@ -2004,11 +1997,6 @@ NS_IMETHODIMP nsBrowserContentHandler::GetDefaultArgs(PRUnichar **aDefaultArgs)
 
     nsString args;
 
-#ifdef FORCE_CHECKIN_GUIDELINES
-    printf("FOR DEBUG BUILDS ONLY:  we are forcing you to see the checkin guidelines when you open a browser window\n");
-    args.AssignWithConversion("http://www.mozilla.org/quality/checkin-guidelines.html");
-#else
-
     nsresult rv;
     nsXPIDLCString url;
     static PRBool timebombChecked = PR_FALSE;
@@ -2081,7 +2069,6 @@ NS_IMETHODIMP nsBrowserContentHandler::GetDefaultArgs(PRUnichar **aDefaultArgs)
     if (NS_SUCCEEDED(rv) && (const char *)url && (PL_strlen((const char *)url))) {              
         args.AssignWithConversion((const char *) url);
     }
-#endif /* FORCE_CHECKIN_GUIDELINES */
 
     *aDefaultArgs = args.ToNewUnicode(); 
     return NS_OK;