diff --git a/openseadragon.js b/openseadragon.js
index 4ac75569..495a7221 100644
--- a/openseadragon.js
+++ b/openseadragon.js
@@ -42,13 +42,9 @@
 
 OpenSeadragon       = window.OpenSeadragon || function(){};
 
-//TODO: remove this hack
-if (!window.SIGNAL){
-    window.SIGNAL = "----seadragon----";
-}
-
 (function( $ ){
     
+    $.SIGNAL = "----seadragon----";
 
     $.delegate = function(object, method) {
         return function() {
@@ -58,7 +54,6 @@ if (!window.SIGNAL){
         };
     };
 
-
     $.format = function(){
 
         var args        = arguments,
@@ -1255,7 +1250,7 @@ $.NavControl.prototype = {
         });
 
         this.elmt = this._group.get_element();
-        this.elmt[SIGNAL] = true;   // hack to get our controls to fade
+        this.elmt[$.SIGNAL] = true;   // hack to get our controls to fade
         this._viewer.add_open($.delegate(this, this._lightUp));
     },
 
@@ -1367,7 +1362,7 @@ $.Control.prototype = {
         this.wrapper.style.display = visible ? "inline-block" : "none";
     },
     setOpacity: function(opacity) {
-        if (this.elmt[SIGNAL] && $.Utils.getBrowser() == $.Browser.IE) {
+        if (this.elmt[$.SIGNAL] && $.Utils.getBrowser() == $.Browser.IE) {
             $.Utils.setElementOpacity(this.elmt, opacity, true);
         } else {
             $.Utils.setElementOpacity(this.wrapper, opacity, true);
diff --git a/src/browser.js b/src/browser.js
deleted file mode 100644
index fa819e32..00000000
--- a/src/browser.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-(function( $ ){
-    
-
-
-}( OpenSeadragon ));
diff --git a/src/control.js b/src/control.js
index fbd2b9c2..b765a387 100644
--- a/src/control.js
+++ b/src/control.js
@@ -32,7 +32,7 @@ $.Control.prototype = {
         this.wrapper.style.display = visible ? "inline-block" : "none";
     },
     setOpacity: function(opacity) {
-        if (this.elmt[SIGNAL] && $.Utils.getBrowser() == $.Browser.IE) {
+        if (this.elmt[$.SIGNAL] && $.Utils.getBrowser() == $.Browser.IE) {
             $.Utils.setElementOpacity(this.elmt, opacity, true);
         } else {
             $.Utils.setElementOpacity(this.wrapper, opacity, true);
diff --git a/src/navcontrol.js b/src/navcontrol.js
index 2252bdcb..36d6b160 100644
--- a/src/navcontrol.js
+++ b/src/navcontrol.js
@@ -79,7 +79,7 @@ $.NavControl.prototype = {
         });
 
         this.elmt = this._group.get_element();
-        this.elmt[SIGNAL] = true;   // hack to get our controls to fade
+        this.elmt[$.SIGNAL] = true;   // hack to get our controls to fade
         this._viewer.add_open($.delegate(this, this._lightUp));
     },
 
diff --git a/src/openseadragon.js b/src/openseadragon.js
index 8cc076ab..46403d48 100644
--- a/src/openseadragon.js
+++ b/src/openseadragon.js
@@ -40,15 +40,11 @@
  *
  **/
 
-OpenSeadragon       = window.OpenSeadragon || function(){};
-
-//TODO: remove this hack
-if (!window.SIGNAL){
-    window.SIGNAL = "----seadragon----";
-}
+OpenSeadragon = window.OpenSeadragon || function(){};
 
 (function( $ ){
     
+    $.SIGNAL = "----seadragon----";
 
     $.delegate = function(object, method) {
         return function() {
@@ -58,7 +54,6 @@ if (!window.SIGNAL){
         };
     };
 
-
     $.format = function(){
 
         var args        = arguments,