diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js
index 46390f0398..557212ec5c 100644
--- a/lib/OpenLayers/Control/LayerSwitcher.js
+++ b/lib/OpenLayers/Control/LayerSwitcher.js
@@ -1,4 +1,4 @@
-// @require: OpenLayers/Control.js
+// @require OpenLayers/Control.js
 /** 
 * @class
 */
@@ -28,15 +28,14 @@ OpenLayers.Control.LayerSwitcher.prototype =
     /** @type String */
     nonActiveColor: "",
     
-    mode: "radio",
 
     /**
     * @constructor
     */
-    initialize: function(options) {
+    initialize: function() {
+        OpenLayers.Control.prototype.initialize.apply(this, arguments);
         this.activeColor = OpenLayers.Control.LayerSwitcher.ACTIVE_COLOR;
         this.nonActiveColor = OpenLayers.Control.LayerSwitcher.NONACTIVE_COLOR;
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
     },
 
     /**
@@ -85,22 +84,10 @@ OpenLayers.Control.LayerSwitcher.prototype =
     singleClick: function(evt) {
         var div = Event.element(evt);
         var layer = div.layer;
-        if (this.mode == "checkbox") {
-            var visible = layer.getVisibility();
+        var visible = layer.getVisibility();
         
-            this.setTabActivation(div, !visible);
-            layer.setVisibility(!visible);
-        } else {
-            this.setTabActivation(div, true);
-            layer.setVisibility(true);
-            for( var i = 0; i < this.map.layers.length; i++) {
-                if (layer != this.map.layers[i]) {
-                    this.setTabActivation($("LayerSwitcher_" + layer.name + "_Tab_p"), false);
-                    layer.setVisibility(false);
-                }
-            }
-        }
-            
+        this.setTabActivation(div, !visible);
+        layer.setVisibility(!visible);
         Event.stop(evt);
     },
     
@@ -128,7 +115,6 @@ OpenLayers.Control.LayerSwitcher.prototype =
         // Inner Label - for Rico Corners
         //
         var backdropLabel = document.createElement('p');
-        backdropLabelOuter.id = "LayerSwitcher_" + layer.name + "_Tab_p";
         backdropLabel.innerHTML = layer.name;
         backdropLabel.style.marginTop = "0px";
         backdropLabel.style.marginBottom = "0px";
diff --git a/lib/OpenLayers/Events.js b/lib/OpenLayers/Events.js
index 4cdeae73ad..ca5fc4fb30 100644
--- a/lib/OpenLayers/Events.js
+++ b/lib/OpenLayers/Events.js
@@ -59,11 +59,7 @@ OpenLayers.Events.prototype = {
         var listeners = this.listeners[type];
         listeners.push( func.bindAsEventListener(obj) );
     },
-    
-    remove: function (type) {
-        this.listeners[type].pop();
-    },
-    
+
     /**
     * @param {event} evt
     */
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index a4cf2cedc5..f5736c5c2c 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -1,4 +1,4 @@
-// @require: OpenLayers/Util.js
+// @require OpenLayers/Util.js
 /**
 * @class
 *
@@ -98,7 +98,7 @@ OpenLayers.Map.prototype = {
         if (!this.controls) {
             this.controls = [];
             this.addControl(new OpenLayers.Control.MouseDefaults());
-            this.addControl(new OpenLayers.Control.PanZoomBar());
+            this.addControl(new OpenLayers.Control.PanZoom());
         }
 
         this.popups = new Array();