diff --git a/gfx/thebes/public/gfxFont.h b/gfx/thebes/public/gfxFont.h
index a84b86b02176..cdb4a6ebcdad 100644
--- a/gfx/thebes/public/gfxFont.h
+++ b/gfx/thebes/public/gfxFont.h
@@ -1536,19 +1536,6 @@ public:
 
     const gfxFontStyle *GetStyle() const { return &mStyle; }
 
-#if !MOZ_WIDGET_GTK2
-#error "don't bother building"
-#endif
-#if 0
-    virtual const gfxFont::Metrics& GetMetrics() const {
-        gfxFont *firstFont = GetFontAt(0);
-        if (!firstFont) // OOM
-            return gfxFont::Metrics();
-        return firstFont->GetMetrics();
-    }
-#endif
-
-    // Used in nsTextRunTransformations: rename to GetSimilar
     virtual gfxFontGroup *Copy(const gfxFontStyle *aStyle) = 0;
 
     /**
diff --git a/gfx/thebes/src/gfxFontconfigUtils.cpp b/gfx/thebes/src/gfxFontconfigUtils.cpp
index b9ff4cb1d6e3..9c9383c1d069 100644
--- a/gfx/thebes/src/gfxFontconfigUtils.cpp
+++ b/gfx/thebes/src/gfxFontconfigUtils.cpp
@@ -261,30 +261,6 @@ gfxFontconfigUtils::gfxFontconfigUtils()
     UpdateFontListInternal();
 }
 
-#if 0
-PR_STATIC_CALLBACK(PLDHashOperator)
-GetFamilyNamesCallback(FamilyHashEntry *aEntry, void *aData)
-{
-    nsStringArray *names = static_cast<nsStringArray *>(aData);
-
-    const FcChar8 *name = aEntry->GetName();
-
-    // XXXkt only want to return entries for which GetStandardFamilyName
-    // returns the same family.
-    names.AppendString(NS_ConvertUTF8toUTF16(ToCString(sname)));
-}
-
-    if (aLangGroup.IsEmpty()) {
-        nsresult rv = UpdateFontListInternal();
-        if (NS_FAILED(rv))
-            return rv;
-
-        mFonts.EnumerateEntries(GetFamilyNamesCallback, &aListOfFonts);
-
-    } else {
-    }
-#endif
-
 nsresult
 gfxFontconfigUtils::GetFontList(const nsACString& aLangGroup,
                                 const nsACString& aGenericFamily,
@@ -648,7 +624,6 @@ gfxFontconfigUtils::GetStandardFamilyName(const nsAString& aFontName, nsAString&
     if (!IsExistingFamily(fontname))
         return NS_OK;
 
-    // XXXkt this could use mFontsByFamily.GetEntry()
     FcPattern *pat = NULL;
     FcObjectSet *os = NULL;
     FcFontSet *givenFS = NULL;
diff --git a/gfx/thebes/src/gfxPangoFonts.cpp b/gfx/thebes/src/gfxPangoFonts.cpp
index 79d3d133592a..e6109da906e9 100644
--- a/gfx/thebes/src/gfxPangoFonts.cpp
+++ b/gfx/thebes/src/gfxPangoFonts.cpp
@@ -525,11 +525,6 @@ GetFontGroup(PangoContext *aContext)
  * (fontconfig cache data) and (when needed) PangoFonts.
  */
 
-#if 0
-static int font_sets = 0;
-static int max_font_sets = 0;
-#endif
-
 class gfxFcPangoFontSet {
 public:
     THEBES_INLINE_DECL_REFCOUNTING(gfxFcPangoFontSet)
@@ -539,24 +534,6 @@ public:
           mFcFontSet(SortPreferredFonts()), mFcFontsTrimmed(0),
           mHaveFallbackFonts(PR_FALSE)
     {
-#if 0
-        ++font_sets;
-        if (font_sets > max_font_sets) {
-            max_font_sets = font_sets;
-            fprintf(stderr, "font sets: %i\n", font_sets);
-        }
-#endif
-    }
-
-    ~gfxFcPangoFontSet()
-    {
-#if 0
-        --font_sets;
-#endif
-        PRInt32 last = mFonts.Length() - 1;
-        for (; last >= 0 && !mFonts[last].mFont; --last) ;
-        fprintf(stderr, "patterns/fonts allocated: %i/%i\n",
-                mFonts.Length(), last + 1);
     }
 
     // A reference is held by the FontSet.
@@ -1539,9 +1516,6 @@ gfxPangoFontGroup::Shutdown()
     }
 
     NS_IF_RELEASE(gLangService);
-#if 0
-    fprintf(stderr, "font sets: %i\n", font_sets);
-#endif
 }
 
 static double