diff --git a/gfx/src/thebes/nsThebesImage.cpp b/gfx/src/thebes/nsThebesImage.cpp
index 7c6b4416dab9..84e33ce141cd 100644
--- a/gfx/src/thebes/nsThebesImage.cpp
+++ b/gfx/src/thebes/nsThebesImage.cpp
@@ -65,10 +65,7 @@ nsThebesImage::nsThebesImage()
     : mWidth(0),
       mHeight(0),
       mDecoded(0,0,0,0),
-      mAlphaDepth(0),
-      mLocked(PR_FALSE),
-      mHadAnyData(PR_FALSE),
-      mUpToDate(PR_FALSE)
+      mAlphaDepth(0)
 {
 }
 
diff --git a/gfx/src/thebes/nsThebesImage.h b/gfx/src/thebes/nsThebesImage.h
index 9df8344994d2..3196bdc23f06 100644
--- a/gfx/src/thebes/nsThebesImage.h
+++ b/gfx/src/thebes/nsThebesImage.h
@@ -111,10 +111,6 @@ protected:
     nsRefPtr<gfxASurface> mOptSurface;
 
     PRUint8 mAlphaDepth;
-    PRUint8 mRealAlphaDepth;
-    PRPackedBool mLocked;
-    PRPackedBool mHadAnyData;
-    PRPackedBool mUpToDate;
 };
 
 #endif /* _NSTHEBESIMAGE_H_ */
diff --git a/gfx/thebes/public/gfxWindowsSurface.h b/gfx/thebes/public/gfxWindowsSurface.h
index 05a9d827e8dc..d9a3858366bc 100644
--- a/gfx/thebes/public/gfxWindowsSurface.h
+++ b/gfx/thebes/public/gfxWindowsSurface.h
@@ -65,7 +65,6 @@ private:
     PRBool mOwnsDC;
     HDC mDC;
     HWND mWnd;
-    HBITMAP mOrigBitmap;
 };
 
 #endif /* GFX_WINDOWSSURFACE_H */
diff --git a/gfx/thebes/src/gfxWindowsSurface.cpp b/gfx/thebes/src/gfxWindowsSurface.cpp
index 04758b5f5f8d..1f88ffae68f7 100644
--- a/gfx/thebes/src/gfxWindowsSurface.cpp
+++ b/gfx/thebes/src/gfxWindowsSurface.cpp
@@ -41,14 +41,14 @@
 THEBES_IMPL_REFCOUNTING(gfxWindowsSurface)
 
 gfxWindowsSurface::gfxWindowsSurface(HWND wnd) :
-    mOwnsDC(PR_TRUE), mWnd(wnd), mOrigBitmap(nsnull)
+    mOwnsDC(PR_TRUE), mWnd(wnd)
 {
     mDC = ::GetDC(mWnd);
     Init(cairo_win32_surface_create(mDC));
 }
 
 gfxWindowsSurface::gfxWindowsSurface(HDC dc, PRBool deleteDC) :
-    mOwnsDC(deleteDC), mDC(dc),mWnd(nsnull), mOrigBitmap(nsnull)
+    mOwnsDC(deleteDC), mDC(dc),mWnd(nsnull)
 {
     Init(cairo_win32_surface_create(mDC));
 }
@@ -72,12 +72,6 @@ gfxWindowsSurface::~gfxWindowsSurface()
 {
     Destroy();
 
-    if (mDC && mOrigBitmap) {
-        HBITMAP tbits = (HBITMAP)::SelectObject(mDC, mOrigBitmap);
-        if (tbits)
-            DeleteObject(tbits);
-    }
-
     if (mOwnsDC) {
         if (mWnd)
             ::ReleaseDC(mWnd, mDC);