diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 9be2364cb..180aee58f 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -308,7 +308,7 @@ MAIN: while( $loop ) {
 							} else {
 								my $full_path = join('/', $Storage->Path(), $day_dir, $event_path);
 # Check storage id
-								if ( !$Event->Storage()->Id() ) {
+								if ( $Storage->Id() and !$Event->Storage()->Id() ) {
 									Info("Correcting StorageId for event $$Event{Id} from $$Event{StorageId} $$Event{Path} to $$Storage{Id} $full_path");
 									$Event->save({ StorageId=>$Storage->Id() });
 									$Event->Path(undef);
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index d7f6da27e..fc80c2140 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -126,28 +126,6 @@ function dataOnClick() {
       window[fnName](ev);
     };
   });
-  document.querySelectorAll("button[data-on-mousedown]").forEach(function(el) {
-    var fnName = el.getAttribute("data-on-mousedown");
-    if ( !window[fnName] ) {
-      console.error("Nothing found to bind to " + fnName + " on element " + el.name);
-      return;
-    }
-
-    el.onmousedown = function(ev) {
-      window[fnName](ev);
-    };
-  });
-  document.querySelectorAll("button[data-on-mouseup]").forEach(function(el) {
-    var fnName = el.getAttribute("data-on-mouseup");
-    if ( !window[fnName] ) {
-      console.error("Nothing found to bind to " + fnName + " on element " + el.name);
-      return;
-    }
-
-    el.onmouseup = function(ev) {
-      window[fnName](ev);
-    };
-  });
 
 }