diff --git a/src/webui/www/public/addtrackers.html b/src/webui/www/public/addtrackers.html
index 5469109bb..37c8c5341 100644
--- a/src/webui/www/public/addtrackers.html
+++ b/src/webui/www/public/addtrackers.html
@@ -6,20 +6,23 @@
 	<link rel="stylesheet" href="css/style.css" type="text/css" />
 	<script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
 	<script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-<script type="text/javascript">
-	window.addEvent('domready', function(){
-        $('trackersUrls').focus();
-	$('addTrackersButton').addEvent('click', function(e){
-		new Event(e).stop();
-		var hash = new URI().getData('hash');
-		new Request({url: 'command/addTrackers', method: 'post', data: {hash: hash, urls: $('trackersUrls').value},
-			onComplete: function() {
-				window.parent.document.getElementById('trackersPage').parentNode.removeChild(window.parent.document.getElementById('trackersPage'));
-			}
-		}).send();
-	});
-});
-</script>
+    <script type="text/javascript">
+        window.addEvent('domready', function(){
+            $('trackersUrls').focus();
+            $('addTrackersButton').addEvent('click', function(e){
+                new Event(e).stop();
+                var hash = new URI().getData('hash');
+                new Request({
+                    url: 'command/addTrackers',
+                    method: 'post',
+                    data: {hash: hash, urls: $('trackersUrls').value},
+                    onComplete: function() {
+                        window.parent.closeWindows();
+                    }
+                }).send();
+        });
+    });
+    </script>
 </head>
 <body>
 <center>
diff --git a/src/webui/www/public/confirmdeletion.html b/src/webui/www/public/confirmdeletion.html
index a92526f3e..b31869ea6 100644
--- a/src/webui/www/public/confirmdeletion.html
+++ b/src/webui/www/public/confirmdeletion.html
@@ -1,65 +1,37 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>QBT_TR(Deletion confirmation - qBittorrent)QBT_TR</title>
-	<link rel="stylesheet" href="css/style.css" type="text/css" />
-	<script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-        <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
-
-<script type="text/javascript">
-	function $get(key,url){
-	    if(arguments.length < 2) url =location.href;
-	    if(arguments.length > 0 && key != ""){
-	        if(key == "#"){
-	            var regex = new RegExp("[#]([^$]*)");
-	        } else if(key == "?"){
-	            var regex = new RegExp("[?]([^#$]*)");
-	        } else {
-	            var regex = new RegExp("[?&]"+key+"=([^&#]*)");
-	        }
-	        var results = regex.exec(url);
-	        return (results == null )? "" : results[1].replace(/%22/g, "'");
-	    } else {
-	        url = url.split("?");
-	        var results = {};
-	            if(url.length > 1){
-	                url = url[1].split("#");
-	                if(url.length > 1) results["hash"] = url[1];
-	                url[0].split("&").each(function(item,index){
-	                    item = item.split("=");
-	                    results[item[0]] = item[1].replace(/%22/g, "'");
-	                });
-	            }
-	        return results;
-	    }
-	}
-
-	var hashes = $get('hashes').split(',');
-
-window.addEvent('domready', function(){
-        $('cancelBtn').focus();
-        $('cancelBtn').addEvent('click', function(e){
-		new Event(e).stop();
-                window.parent.document.getElementById('confirmDeletionPage').parentNode.removeChild(window.parent.document.getElementById('confirmDeletionPage'));
-        });
-	$('confirmBtn').addEvent('click', function(e){
-		new Event(e).stop();
-		var cmd = 'command/delete';
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>QBT_TR(Deletion confirmation - qBittorrent)QBT_TR</title>
+    <link rel="stylesheet" href="css/style.css" type="text/css" />
+    <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
+    <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
+    <script type="text/javascript">
+        var hashes = new URI().getData('hashes').split('|');
+        window.addEvent('domready', function(){
+            $('cancelBtn').focus();
+            $('cancelBtn').addEvent('click', function(e){
+                new Event(e).stop();
+                window.parent.closeWindows();
+            });
+            $('confirmBtn').addEvent('click', function(e){
+                new Event(e).stop();
+                var cmd = 'command/delete';
                 if($('deleteFromDiskCB').get('checked'))
-			 cmd = 'command/deletePerm';
-                new Request({url: cmd, 
-                             method: 'post', 
-                             data: {hashes: hashes.join('|')},
-                             onComplete: function() {
-				window.parent.document.getElementById('confirmDeletionPage').parentNode.removeChild(window.parent.document.getElementById('confirmDeletionPage'));
-			     }
-                            }).send();
-		
-	});
-});
-</script>
-
+                     cmd = 'command/deletePerm';
+                new Request({
+                    url: cmd,
+                    method: 'post',
+                    data: {
+                        'hashes': hashes.join('|')
+                    },
+                    onComplete: function() {
+                        window.parent.closeWindows();
+                    }
+                }).send();
+            });
+        });
+    </script>
 </head>
 <body>
 <br/>
diff --git a/src/webui/www/public/scripts/mocha-init.js b/src/webui/www/public/scripts/mocha-init.js
index 1fdd5e924..c4ae5b420 100644
--- a/src/webui/www/public/scripts/mocha-init.js
+++ b/src/webui/www/public/scripts/mocha-init.js
@@ -234,17 +234,12 @@ initializeWindows = function() {
 
     deleteFN = function() {
         var h = myTable.selectedIds();
-        /*if(h.length && confirm('QBT_TR(Are you sure you want to delete the selected torrents from the transfer list?)QBT_TR')) {
-            h.each(function(item, index){
-                new Request({url: 'command/delete', method: 'post', data: {hash: item}}).send();
-            });
-        }*/
         if (h.length) {
             new MochaUI.Window({
                 id: 'confirmDeletionPage',
-                title: "QBT_TR(Deletion confirmation - qBittorrent)QBT_TR",
+                title: "QBT_TR(Deletion confirmation)QBT_TR",
                 loadMethod: 'iframe',
-                contentURL: 'confirmdeletion.html?hashes=' + h.join(','),
+                contentURL: 'confirmdeletion.html?hashes=' + h.join("|"),
                 scrollbars: false,
                 resizable: false,
                 maximizable: false,
diff --git a/src/webui/www/public/transferlist.html b/src/webui/www/public/transferlist.html
index 54c8105e3..dbfb707b6 100644
--- a/src/webui/www/public/transferlist.html
+++ b/src/webui/www/public/transferlist.html
@@ -16,9 +16,6 @@
             Delete : function (element, ref) {
                 deleteFN();
             },
-            DeleteHD : function (element, ref) {
-                deleteHDFN();
-            },
             Start : function (element, ref) {
                 startFN();
             },
