diff --git a/mozilla/xpfe/global/resources/content/commonDialog.js b/mozilla/xpfe/global/resources/content/commonDialog.js
index 5efd0c9dd9b..9cd895dd7c3 100644
--- a/mozilla/xpfe/global/resources/content/commonDialog.js
+++ b/mozilla/xpfe/global/resources/content/commonDialog.js
@@ -29,8 +29,6 @@ function commonDialogOnLoad()
   doSetOKCancel(commonDialogOnOK, commonDialogOnCancel, commonDialogOnButton2, commonDialogOnButton3);
   param = window.arguments[0].QueryInterface(Components.interfaces.nsIDialogParamBlock);
 	
-  dump("*** param is " + typeof(param) + "\n");
-  
   // display the main text
 	var messageText = param.GetString(0);
   var messageParent = document.getElementById("info.box");
diff --git a/mozilla/xpfe/global/resources/content/nsWidgetStateManager.js b/mozilla/xpfe/global/resources/content/nsWidgetStateManager.js
index f347c726ce4..dc090dcd69e 100644
--- a/mozilla/xpfe/global/resources/content/nsWidgetStateManager.js
+++ b/mozilla/xpfe/global/resources/content/nsWidgetStateManager.js
@@ -221,9 +221,7 @@ nsWidgetStateManager.prototype =
           // set menulist specific properties
           if( aDataObject.data != undefined )
             { 
-              var matchElement = element.getElementsByAttribute( "data", aDataObject.data );
-              if (matchElement.length && matchElement[0])
-                element.selectedItem = matchElement[0];
+              element.selectedItem = element.getElementsByAttribute( "data", aDataObject.data )[0];
             }
         },
         
diff --git a/mozilla/xpfe/global/resources/content/treeBindings.xml b/mozilla/xpfe/global/resources/content/treeBindings.xml
index af6abae17b0..26e6067ac60 100644
--- a/mozilla/xpfe/global/resources/content/treeBindings.xml
+++ b/mozilla/xpfe/global/resources/content/treeBindings.xml
@@ -415,77 +415,5 @@
     </content>
   </binding>
 
-  <binding id="popupcell">
-    <content autostretch="never" allowevents="true">
-      <xul:menu>
-        <xul:image class="treecell-popup-icon"/>
-        <xul:menupopup popupanchor="bottomright"
-                       popupalign="topright"
-                       oncommand="this.parentNode.parentNode.toggleColumn(event.target, document);"
-                       oncreate="this.buildPopup(this);"/>
-      </xul:menu>
-    </content>
-    <interface>
-      <method name="buildPopup">
-        <argument name="aMenupopup"/>
-        <body>
-        <![CDATA[
-          var treeColGroup = document.getElementById(this.getAttribute("columns"));
-          var treeHeadRow = document.getElementById(this.getAttribute("head"));
-          var skipCell = document.getElementById(this.getAttribute("popupcell"));
-
-          var popupChild = popup.firstChild;
-          if (popupChild)
-            return;
-        
-          var currTreeCol = treeHeadRow.firstChild;
-          var currColNode = treeColGroup.firstChild;
-          while (currTreeCol) {
-            if (currColNode.tagName == "splitter")
-              currColNode = currColNode.nextSibling;
-        
-            if (skipCell != currTreeCol) {
-        		// Construct an entry for each cell in the row.
-        		var columnName = currTreeCol.getAttribute("value");
-        		var v = document.createElement("menuitem");
-        		v.setAttribute("type", "checkbox");
-        		v.setAttribute("value", columnName);
-        		if (columnName == "") {
-        		  var display = currTreeCol.getAttribute("display");
-        		  v.setAttribute("value", display);
-        		}
-        		v.setAttribute("colid", currColNode.id);
-        		var hidden = currColNode.getAttribute("hidden");
-        		if (hidden != "true")
-        		  v.setAttribute("checked", "true");
-        
-        		popup.appendChild(v);
-        	}
-        
-        	currTreeCol = currTreeCol.nextSibling;
-        	currColNode = currColNode.nextSibling;
-          }
-        ]]>
-        </body>
-      </method>
-      <method name="toggleColumn">
-        <argument name="popupElement"/>
-        <argument name="doc"/>
-        <body>
-        <![CDATA[
-          var colid = popupElement.getAttribute("colid");
-          var colNode = doc.getElementById(colid);
-          if (colNode) {
-            var checkedState = popupElement.getAttribute("checked");
-          	if (checkedState == "true")
-          	  colNode.removeAttribute("hidden");
-          	else colNode.setAttribute("hidden", "true");
-          }
-        ]]>
-        </body>
-      </method>
-    </interface>
-  </binding>
-
 </bindings>
 
diff --git a/mozilla/xpfe/global/resources/content/xulBindings.xml b/mozilla/xpfe/global/resources/content/xulBindings.xml
index f4937557f83..0790e698ef7 100644
--- a/mozilla/xpfe/global/resources/content/xulBindings.xml
+++ b/mozilla/xpfe/global/resources/content/xulBindings.xml
@@ -157,7 +157,7 @@
   <!-- XUL <button>s -->
   <binding id="buttonleft" extends="chrome://global/content/xulBindings.xml#basetext">
     <content excludes="observes,template">
-  	  <xul:box class="button-internal-box" autostretch="never" flex="1" inherits="disabled">
+  	  <xul:box class="button-internal-box" autostretch="never" flex="1">
         <xul:image class="button-icon" inherits="src"/>
         <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
           <xul:text class="button-text" inherits="value,accesskey,crop,dragover-top"/>
@@ -168,7 +168,7 @@
 
   <binding id="buttontop" extends="chrome://global/content/xulBindings.xml#basetext">
     <content excludes="observes,template">
-  	  <xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1" inherits="disabled">
+  	  <xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1">
         <xul:image class="button-icon" inherits="src"/>
         <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
           <xul:text class="button-text" inherits="value,accesskey,crop,dragover-top"/>
@@ -179,7 +179,7 @@
   
   <binding id="buttonright" extends="chrome://global/content/xulBindings.xml#basetext">
     <content excludes="observes,template">
-  	  <xul:box class="button-internal-box" inherits="orient,disabled" autostretch="never" flex="1">
+  	  <xul:box class="button-internal-box" inherits="orient" autostretch="never" flex="1">
         <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
           <xul:text class="button-text" inherits="value,accesskey,crop,dragover-top"/>
         </xul:box>
@@ -190,7 +190,7 @@
 
   <binding id="buttonbottom" extends="chrome://global/content/xulBindings.xml#basetext">
     <content excludes="observes,template">
-  	  <xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1" inherits="disabled">
+  	  <xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1">
         <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
           <xul:text class="button-text" inherits="value,accesskey,crop,dragover-top"/>
         </xul:box>
