diff --git a/channel.js b/channel.js
index 2639c6fc..88467f5a 100644
--- a/channel.js
+++ b/channel.js
@@ -1117,32 +1117,6 @@ Channel.prototype.onVideoChange = function () {
     this.broadcastDrinks();
 }
 
-// The server autolead function
-function mediaUpdate(chan, id) {
-    // Bail cases - video changed, someone's leader, no video playing
-    if(chan.media == null ||
-           id != chan.media.id ||
-           chan.leader != null ||
-           chan.users.length == 0) {
-        return;
-    }
-
-    chan.media.currentTime += (new Date().getTime() - chan.time) / 1000.0;
-    chan.time = new Date().getTime();
-
-    // Show's over, move on to the next thing
-    if(chan.media.currentTime > chan.media.seconds + 1) {
-        chan.playNext();
-    }
-    // Send updates about every 5 seconds
-    else if(chan.i % 5 == 0) {
-        chan.sendAll("mediaUpdate", chan.media.timeupdate());
-    }
-    chan.i++;
-
-    setTimeout(function() { mediaUpdate(chan, id); }, 1000);
-}
-
 function isLive(type) {
     return type == "li" // Livestream.com
         || type == "tw" // Twitch.tv
@@ -1253,12 +1227,12 @@ Channel.prototype.addMedia = function(data, user) {
                     return;
                 }
                 else {
-                    chan.logger.log("### " + user.name + " queued " + item.media.title);
-                    chan.sendAll("queue", {
+                    self.logger.log("### " + user.name + " queued " + item.media.title);
+                    self.sendAll("queue", {
                         item: item.pack(),
                         after: item.prev ? item.prev.uid : "prepend"
                     });
-                    chan.broadcastPlaylistMeta();
+                    self.broadcastPlaylistMeta();
                 }
             });
             return;
@@ -1278,14 +1252,14 @@ Channel.prototype.addMedia = function(data, user) {
                     return;
                 }
                 else {
-                    chan.logger.log("### " + user.name + " queued " + item.media.title);
-                    chan.sendAll("queue", {
+                    self.logger.log("### " + user.name + " queued " + item.media.title);
+                    self.sendAll("queue", {
                         item: item.pack(),
                         after: item.prev ? item.prev.uid : "prepend"
                     });
-                    chan.broadcastPlaylistMeta();
+                    self.broadcastPlaylistMeta();
                     if(!item.temp)
-                        chan.cacheMedia(item.media);
+                        self.cacheMedia(item.media);
                 }
             });
         }
diff --git a/www/channel.html b/www/channel.html
index e87bd8b8..9cee56ee 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -246,12 +246,12 @@
   <script src="./assets/js/ui.js"></script>
   <script src="./assets/js/callbacks.js"></script>
   <!-- APIs -->
-  <script src="http://www.youtube.com/iframe_api"></script>
-  <script src="http://api.dmcdn.net/all.js"></script>
-  <script src="http://jwpsrv.com/library/QouFCLBMEeKC+CIACpYGxA.js"></script>
-  <script src="./assets/js/sc.js"></script>
-  <script src="./assets/js/froogaloop.min.js"></script>
-  <script src="./assets/js/swf.js"></script>
+  <script defer src="http://www.youtube.com/iframe_api"></script>
+  <script defer src="http://api.dmcdn.net/all.js"></script>
+  <script defer src="http://jwpsrv.com/library/QouFCLBMEeKC+CIACpYGxA.js"></script>
+  <script defer src="./assets/js/sc.js"></script>
+  <script defer src="./assets/js/froogaloop.min.js"></script>
+  <script defer src="./assets/js/swf.js"></script>
   <!-- Third party -->
   <script src="./assets/js/bootstrap.js"></script>
   <script src="./assets/js/bootstrap-transition.js"></script>