diff --git a/www/js/services/settings-services.js b/www/js/services/settings-services.js
index abcb5c9612c70cb81ce825b4b90e400e33de0f47..e25e68a912f3b37338e45eedc1cb2c406c1685e6 100644
--- a/www/js/services/settings-services.js
+++ b/www/js/services/settings-services.js
@@ -48,7 +48,6 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config'])
 
   var
   constants = {
-    OLD_STORAGE_KEY: 'CESIUM_SETTINGS', // for version < v1.1
     STORAGE_KEY: 'settings', // for version >= v1.1.0
     KEEP_AUTH_IDLE_SESSION: 9999
   },
@@ -225,14 +224,8 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config'])
   restore = function() {
     var now = Date.now();
 
-    return $q.all([
-        localStorage.getObject(constants.OLD_STORAGE_KEY), // for version < v1.1
-        localStorage.getObject(constants.STORAGE_KEY)
-      ])
-        .then(function(res) {
-          // Clean old storage
-          localStorage.put(constants.OLD_STORAGE_KEY, null);
-          var storedData = res[1] || res[0];
+    return localStorage.getObject(constants.STORAGE_KEY)
+        .then(function(storedData) {
           // No settings stored
           if (!storedData) {
             console.debug("[settings] No settings in local storage. Using defaults.");
diff --git a/www/js/services/storage-services.js b/www/js/services/storage-services.js
index 7517e6c15f6ace78adcf440fc33d8763e9b02553..a134ad66585f9b8a9f2bea728d72529756326183 100644
--- a/www/js/services/storage-services.js
+++ b/www/js/services/storage-services.js
@@ -81,21 +81,31 @@ angular.module('cesium.storage.services', [ 'cesium.config'])
 
     // Set a value to the secure storage (or remove if value is not defined)
     exports.secure.put = function(key, value) {
-      var deferred = $q.defer();
-      if (angular.isDefined(value)) {
-        exports.secure.storage.set(
-          function (key) { deferred.resolve(); },
-          function (err) { deferred.reject(err); },
-          key, value);
-      }
-      // Remove
-      else {
-        exports.secure.storage.remove(
-          function (key) { deferred.resolve(); },
-          function (err) { deferred.reject(err); },
-          key);
-      }
-      return deferred.promise;
+      return $q(function(resolve, reject) {
+        if (value !== undefined && value !== null) {
+          exports.secure.storage.set(
+            function (key) {
+              resolve();
+            },
+            function (err) {
+              $log.error(err);
+              reject(err);
+            },
+            key, value);
+        }
+        // Remove
+        else {
+          exports.secure.storage.remove(
+            function () {
+              resolve();
+            },
+            function (err) {
+              $log.error(err);
+              resolve(); // Error = not found
+            },
+            key);
+        }
+      });
     };
 
     // Get a value from the secure storage
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index 7efa749908ae8e16bb793798da417cdbbedf85e9..cff0e7afc6a5fff90a34517d6e814cb30f9c2806 100644
--- a/www/js/services/wallet-services.js
+++ b/www/js/services/wallet-services.js
@@ -17,8 +17,6 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
     var
     exports,
     constants = {
-      // @Deprecated
-      OLD_STORAGE_KEY: 'CESIUM_DATA',
       STORAGE_PUBKEY: 'pubkey',
       STORAGE_UID: 'uid',
       STORAGE_DATA_PREFIX: 'data-',
@@ -541,12 +539,6 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
     },
 
     restore = function() {
-      // Clean old storage,
-      localStorage.get(constants.OLD_STORAGE_KEY)
-        .then(function(res) {
-          if (res && res != "null") localStorage.put(constants.OLD_STORAGE_KEY, null); // remove
-        });
-
       return  $q.all([
           sessionStorage.get(constants.STORAGE_SECKEY),
           localStorage.get(constants.STORAGE_PUBKEY),