diff --git a/webshell/tests/viewer/nsBrowserWindow.cpp b/webshell/tests/viewer/nsBrowserWindow.cpp
index a25b143af36..20ef3475262 100644
--- a/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -932,22 +932,6 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
     }
     break;
 
-  case VIEWER_GFX_LISTBOX_ON: 
-    SetBoolPref("nglayout.widget.gfxlistbox", PR_TRUE);
-    break;
-
-  case VIEWER_GFX_LISTBOX_OFF: 
-    SetBoolPref("nglayout.widget.gfxlistbox", PR_FALSE);
-    break;
-
-  case VIEWER_GFX_COMBOBOX_ON: 
-    SetBoolPref("nglayout.widget.gfxcombobox", PR_TRUE);
-    break;
-
-  case VIEWER_GFX_COMBOBOX_OFF: 
-    SetBoolPref("nglayout.widget.gfxcombobox", PR_FALSE);
-    break;
-
 #ifdef PURIFY
   case VIEWER_PURIFY_SHOW_NEW_LEAKS:
   case VIEWER_PURIFY_SHOW_ALL_LEAKS:
diff --git a/webshell/tests/viewer/nsViewerApp.cpp b/webshell/tests/viewer/nsViewerApp.cpp
index a39e3d8b77b..679faab2e07 100644
--- a/webshell/tests/viewer/nsViewerApp.cpp
+++ b/webshell/tests/viewer/nsViewerApp.cpp
@@ -123,9 +123,24 @@ static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID);
 #define DEFAULT_WIDTH 620
 #define DEFAULT_HEIGHT 400
 
+#include <windows.h>
+
+#define MEM_START  MEMORYSTATUS stat1; \
+                   MEMORYSTATUS stat2;\
+                   GlobalMemoryStatus(&stat1);
+
+#define MEM_END(_TXT)  GlobalMemoryStatus(&stat2); \
+  printf("****\n%s - Bytes allocated by operation  Virt: %ld bytes  %ld kBytes   Phys: %ld bytes\n", (_TXT), \
+         stat1.dwAvailVirtual - stat2.dwAvailVirtual, \
+         (stat1.dwAvailVirtual - stat2.dwAvailVirtual) / 1024, \
+         long(stat1.dwTotalPhys) - long(stat2.dwTotalPhys));
+
+MEMORYSTATUS stat1;
+MEMORYSTATUS stat2;
 
 nsViewerApp::nsViewerApp()
 {
+  GlobalMemoryStatus(&stat1);
   NS_INIT_REFCNT(); 
 
   char * text = PR_GetEnv("NGLAYOUT_HOME");
@@ -147,6 +162,7 @@ nsViewerApp::nsViewerApp()
 nsViewerApp::~nsViewerApp()
 {
   Destroy();
+  MEM_END("ViewerApp")
 }
 
 NS_IMPL_THREADSAFE_ADDREF(nsViewerApp)
diff --git a/webshell/tests/viewer/resources.h b/webshell/tests/viewer/resources.h
index cc383944572..3e46d080084 100644
--- a/webshell/tests/viewer/resources.h
+++ b/webshell/tests/viewer/resources.h
@@ -89,10 +89,6 @@
 #define VIEWER_USE_DTD_MODE         40079
 #define VIEWER_STANDARD_MODE        40080
 #define VIEWER_NAV_QUIRKS_MODE      40081
-#define VIEWER_GFX_LISTBOX_ON       40082
-#define VIEWER_GFX_LISTBOX_OFF      40083
-#define VIEWER_GFX_COMBOBOX_ON      40084
-#define VIEWER_GFX_COMBOBOX_OFF     40085
 #define VIEWER_DEBUG_DUMP_REFLOW_TOTS 40086
 
 #define VIEWER_TOGGLE_PAINT_FLASHING         40200
diff --git a/webshell/tests/viewer/unix/gtk/nsGtkMenu.cpp b/webshell/tests/viewer/unix/gtk/nsGtkMenu.cpp
index c3f543178b0..fafdae8b82e 100644
--- a/webshell/tests/viewer/unix/gtk/nsGtkMenu.cpp
+++ b/webshell/tests/viewer/unix/gtk/nsGtkMenu.cpp
@@ -136,12 +136,6 @@ GtkItemFactoryEntry menu_items[] =
   { "/Style/_Gfx Scrollbars Mode",		nsnull,	nsnull,			0,			"<Branch>" },
   { "/Style/Gfx Scrollbars Mode/Gfx On",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_SCROLLBARS_ON,	nsnull },
   { "/Style/Gfx Scrollbars Mode/Gfx Off",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_SCROLLBARS_OFF,	nsnull },
-  { "/Style/Gfx _Combobox Mode",		nsnull,	nsnull,			0,			"<Branch>" },
-  { "/Style/Gfx Combobox Mode/Gfx On",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_COMBOBOX_ON,	nsnull },
-  { "/Style/Gfx Combobox Mode/Gfx Off",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_COMBOBOX_OFF,	nsnull },
-  { "/Style/Gfx _Listbox Mode",		nsnull,	nsnull,			0,			"<Branch>" },
-  { "/Style/Gfx Listbox Mode/Gfx On",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_LISTBOX_ON,	nsnull },
-  { "/Style/Gfx Listbox Mode/Gfx Off",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_LISTBOX_OFF,	nsnull },
 //#endif
 
   { "/_URLs",                                nsnull, nsnull,                 0,              "<Branch>" },
diff --git a/webshell/tests/viewer/viewer.rc b/webshell/tests/viewer/viewer.rc
index 982b26e70c6..80704b35b88 100644
--- a/webshell/tests/viewer/viewer.rc
+++ b/webshell/tests/viewer/viewer.rc
@@ -141,16 +141,6 @@ VIEWER MENU DISCARDABLE
       MENUITEM "Gfx Off", VIEWER_GFX_SCROLLBARS_OFF
       MENUITEM "Gfx On", VIEWER_GFX_SCROLLBARS_ON
     }
-    POPUP "&Gfx Comboxbox Mode Pref"
-    {
-      MENUITEM "Gfx Off", VIEWER_GFX_COMBOBOX_OFF
-      MENUITEM "Gfx On", VIEWER_GFX_COMBOBOX_ON
-    }
-    POPUP "&Gfx Listbox Mode Pref"
-    {
-      MENUITEM "Gfx Off", VIEWER_GFX_LISTBOX_OFF
-      MENUITEM "Gfx On", VIEWER_GFX_LISTBOX_ON
-    }
   }
   POPUP "&URLs"
   {