diff --git a/www/common/mergeDrive.js b/www/common/mergeDrive.js
index 59f4363b3..a633489b2 100644
--- a/www/common/mergeDrive.js
+++ b/www/common/mergeDrive.js
@@ -33,7 +33,6 @@ define([
                 var onMigrated = function () {
                     oldFo.fixFiles(true);
                     var manager = proxyData.manager;
-                    var oldRecentPads = parsed.drive[oldFo.FILES_DATA];
                     var oldFiles = oldFo.getFiles([oldFo.FILES_DATA]);
                     oldFiles.forEach(function (id) {
                         var data = oldFo.getFileData(id);
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index accc5c380..7f3aebb00 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1185,12 +1185,11 @@ define([
                 }));
             }).nThen(function (waitFor) {
                 // 2a. add the shared folder to the path in our drive
-                console.log('adding');
                 store.userObject.add(id, path);
                 onSync(waitFor());
 
                 // 2b. load the proxy
-                rt = loadSharedFolder(id, data.folderData, waitFor(function () {
+                loadSharedFolder(id, data.folderData, waitFor(function (rt) {
                     if (data.metadata) { // Creating a new shared folder
                         rt.proxy.metadata = data.metadata;
                         onSync(waitFor());
diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js
index 454ba3fc6..703426d56 100644
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -92,7 +92,7 @@ define([
                     var fd = exp.getFileData(id);
                     var channelId = fd.channel;
                     // If trying to remove an owned pad, remove it from server also
-                    if (!isOwnPadRemoved &&
+                    if (!isOwnPadRemoved && !sharedFolder &&
                             fd.owners && fd.owners.indexOf(edPublic) !== -1 && channelId) {
                         removeOwnedChannel(channelId, function (obj) {
                             if (obj && obj.error) {
@@ -113,10 +113,6 @@ define([
             });
             if (!toClean.length) { return; }
             cb(null, toClean);
-            unpinPads(toClean, function (response) {
-                if (response && response.error) { return console.error(response.error); }
-                // console.error(response);
-            });
         };
         var deleteHrefs = function (ids) {
             ids.forEach(function (obj) {
diff --git a/www/common/userObject.js b/www/common/userObject.js
index 2449a2dc5..ce1cfb665 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -17,7 +17,6 @@ define([
 
     module.init = function (files, config) {
         var exp = {};
-        var pinPads = config.pinPads;
         var sframeChan = config.sframeChan;
 
         var FILES_DATA = module.FILES_DATA = exp.FILES_DATA = Constants.storageKey;
diff --git a/www/drive/inner.js b/www/drive/inner.js
index 596924101..d648ed092 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -90,7 +90,7 @@ define([
     //var $folderOpenedIcon = $('<img>', {src: "/customize/images/icons/folderOpen.svg", "class": "folder icon"});
     var $folderOpenedEmptyIcon = $folderOpenedIcon.clone();
     var $sharedFolderIcon = $('<span>', {"class": faSharedFolder + " fa cp-app-drive-icon-folder"});
-    var $sharedFolderOpenedIcon = $sharedFolderIcon.clone();
+    //var $sharedFolderOpenedIcon = $sharedFolderIcon.clone();
     //var $upIcon = $('<span>', {"class": "fa fa-arrow-circle-up"});
     var $unsortedIcon = $('<span>', {"class": "fa fa-files-o"});
     var $templateIcon = $('<span>', {"class": "fa fa-cubes"});
@@ -1518,14 +1518,14 @@ define([
 
             var skipNext = false; // When encountering a shared folder, skip a key in the path
             path.forEach(function (p, idx) {
-                if (skipNext) { return skipNext = false; }
+                if (skipNext) { skipNext = false; return; }
                 if (isTrash && [2,3].indexOf(idx) !== -1) { return; }
 
                 var name = p;
 
-                var el = manager.find(path.slice(0, idx+1));
-                if (manager.isSharedFolder(el)) {
-                    name = manager.getSharedFolderData(el).title;
+                var currentEl = manager.find(path.slice(0, idx+1));
+                if (manager.isSharedFolder(currentEl)) {
+                    name = manager.getSharedFolderData(currentEl).title;
                     skipNext = true;
                 }
 
diff --git a/www/drive/main.js b/www/drive/main.js
index 0247f4a4b..21b563da9 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -42,7 +42,7 @@ define([
             if (hash) {
                 // Add a shared folder!
                 // XXX password?
-                Cryptpad.addSharedFolder(secret, function (obj) {
+                Cryptpad.addSharedFolder(secret, function () {
                     window.location.hash = "";
                     cb(null, secret);
                 });