diff --git a/event-pubsub-browser.js b/event-pubsub-browser.js
index 82dae11..b92d44d 100644
--- a/event-pubsub-browser.js
+++ b/event-pubsub-browser.js
@@ -22,28 +22,14 @@ window.pubsub=(
             }
             checkScope.apply(this);
 
-            if(type=='*'){
-                var params=Array.prototype.slice.call(arguments,1);
-                for(
-                    var keys    = Object.keys(this._events_),
-                        count   = keys.length,
-                        i=0;
-                    i<count;
-                    i++
-                ){
-                    params.unshift(keys[i]);
-                    this.off.apply(this,params);
-                }
-            }
-
-            if(!this._events_[type])
-                return;
-
             if(handler=='*'){
                 delete this._events_[type];
                 return;
             }
 
+            if(!this._events_[type])
+                return;
+
             for(var i=0,
                     count=this._events_[type].length;
                 i<count;
diff --git a/event-pubsub.js b/event-pubsub.js
index 283b9dd..8debbf3 100644
--- a/event-pubsub.js
+++ b/event-pubsub.js
@@ -21,6 +21,7 @@ function unsub(type,handler){
 
     if(handler=='*'){
         delete this._events_[type];
+        return;
     }
 
     if(!this._events_[type])
diff --git a/package.json b/package.json
index 234dc13..2935617 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "event-pubsub",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Pubsub events for Node and the browser allowing event scoping and multiple scopes. Easy for any developer level. No frills, just high speed pubsub events!",
   "main": "event-pubsub.js",
   "directories": {