1 files changed, 8 insertions, 12 deletions

diff --git a/lib/main.js b/lib/main.js
index 03bc69d..eca533e 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -12,19 +12,15 @@
 // http://ehsanakhgari.org/blog/2010-05-31/my-experience-jetpack-sdk#comment-1253
 // 
 "use strict";
-var utilMod = require("util");
-var logMod = require("logger");
-
-jetpack.future.import("pageMods");
-jetpack.future.import("storage.simple");
-jetpack.future.import("selection");
-jetpack.future.import("clipboard");
+var util = require("util");
+var logger = require("logger");
+var file = require("file");
+var myStorage = require("simple-storage").storage;
 
 var TriagedDistro = 13;
 var NumberOfFrames = 7;
 var XMLRPCurl = "https://bugzilla.redhat.com/xmlrpc.cgi";
 var bugURL = "https://bugzilla.redhat.com/show_bug.cgi?id=";
-var myStorage = jetpack.storage.simple;
 
 // ==============================================================
 // https://wiki.mozilla.org/Labs/Jetpack/JEP/24
@@ -67,7 +63,7 @@ config.matches = [
     "https://bugzilla.redhat.com/show_bug.cgi",
     "https://bugzilla.mozilla.org/show_bug.cgi"
 ];
-utilMod.loadJSON(jetpack.storage.settings.JSONURL, function(parsedData) {
+util.loadJSON(jetpack.storage.settings.JSONURL, function(parsedData) {
     config.gJSONData = parsedData;
 
     // Get card translation table
@@ -76,12 +72,12 @@ utilMod.loadJSON(jetpack.storage.settings.JSONURL, function(parsedData) {
         keys += key + " ";
     }
     if ("PCIIDsURL" in config.gJSONData.configData) {
-        utilMod.loadJSON(config.gJSONData.configData.PCIIDsURL, function(response) {
+        util.loadJSON(config.gJSONData.configData.PCIIDsURL, function(response) {
             config.PCI_ID_Array = response;
         });
     }
 
-    config.logger = new logMod.Logger(myStorage.logs,
+    config.logger = new logger.Logger(myStorage.logs,
         config.gJSONData.constantData.bugzillalabelAbbreviations);
     
     let callback = function(doc) {
@@ -93,4 +89,4 @@ utilMod.loadJSON(jetpack.storage.settings.JSONURL, function(parsedData) {
     };
 
     jetpack.pageMods.add(callback, config);
-}, this);
+}, this);
\ No newline at end of file