diff --git a/src/background.html b/src/background.html
index 0a6a791..1a28d03 100644
--- a/src/background.html
+++ b/src/background.html
@@ -17,7 +17,6 @@
 <script src="js/vapi-cachestorage.js"></script>
 
 <script src="js/background.js"></script>
-<script src="js/xal.js"></script>
 <script src="js/usersettings.js"></script>
 <script src="js/liquid-dict.js"></script>
 <script src="js/matrix.js"></script>
diff --git a/src/js/messaging.js b/src/js/messaging.js
index 0fe9160..c8f08d0 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -883,7 +883,7 @@ var restoreUserData = function(userData) {
 
     // If we are going to restore all, might as well wipe out clean local
     // storage
-    µm.XAL.keyvalRemoveAll(onAllRemoved);
+    vAPI.storage.clear(onAllRemoved);
 };
 
 /******************************************************************************/
@@ -892,7 +892,7 @@ var resetUserData = function() {
     var onAllRemoved = function() {
         vAPI.app.restart();
     };
-    µm.XAL.keyvalRemoveAll(onAllRemoved);
+    vAPI.storage.clear(onAllRemoved);
 };
 
 /******************************************************************************/
diff --git a/src/js/storage.js b/src/js/storage.js
index 002f9ab..701fdb5 100644
--- a/src/js/storage.js
+++ b/src/js/storage.js
@@ -41,7 +41,7 @@
 /******************************************************************************/
 
 µMatrix.saveUserSettings = function() {
-    this.XAL.keyvalSetMany(
+    vAPI.storage.set(
         this.userSettings,
         this.getBytesInUse.bind(this)
     );
diff --git a/src/js/xal.js b/src/js/xal.js
deleted file mode 100644
index 10e980e..0000000
--- a/src/js/xal.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
-
-    µMatrix - a Chromium browser extension to black/white list requests.
-    Copyright (C) 2014  Raymond Hill
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see {http://www.gnu.org/licenses/}.
-
-    Home: https://github.com/gorhill/uMatrix
-*/
-
-/* global chrome, µMatrix */
-
-/******************************************************************************/
-
-µMatrix.XAL = (function(){
-
-/******************************************************************************/
-
-var exports = {};
-var noopFunc = function(){};
-
-/******************************************************************************/
-
-exports.keyvalSetOne = function(key, val, callback) {
-    var bin = {};
-    bin[key] = val;
-    vAPI.storage.set(bin, callback || noopFunc);
-};
-
-/******************************************************************************/
-
-exports.keyvalGetOne = function(key, callback) {
-    vAPI.storage.get(key, callback);
-};
-
-/******************************************************************************/
-
-exports.keyvalSetMany = function(dict, callback) {
-    vAPI.storage.set(dict, callback || noopFunc);
-};
-
-/******************************************************************************/
-
-exports.keyvalRemoveOne = function(key, callback) {
-    vAPI.storage.remove(key, callback || noopFunc);
-};
-
-/******************************************************************************/
-
-exports.keyvalRemoveAll = function(callback) {
-    vAPI.storage.clear(callback || noopFunc);
-};
-
-/******************************************************************************/
-
-return exports;
-
-/******************************************************************************/
-
-})();