diff --git a/src/main/java/PrivacyDog.java b/src/main/java/PrivacyDog.java
index 94aa9fa..c77ae24 100644
--- a/src/main/java/PrivacyDog.java
+++ b/src/main/java/PrivacyDog.java
@@ -5,7 +5,10 @@
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.ParseException;
-import soot.*;
+import soot.G;
+import soot.PackManager;
+import soot.Scene;
+import soot.Transform;
 import soot.options.Options;
 
 import java.io.*;
@@ -14,8 +17,6 @@
 import java.util.*;
 import java.util.logging.Logger;
 
-import static soot.options.Options.output_format_jimple;
-
 public class PrivacyDog {
 
     static String targetPath = "";
@@ -27,6 +28,7 @@ public class PrivacyDog {
 
     private static void setupSoot(String taskPath) throws IOException {
         G.reset();
+        Options.v().set_wrong_staticness(Options.wrong_staticness_ignore);
         Options.v().set_allow_phantom_refs(true);
         Options.v().set_allow_phantom_elms(true);
         Options.v().set_ignore_resolving_levels(true);
diff --git a/src/main/java/ValueSet.java b/src/main/java/ValueSet.java
index 9beced7..f4a8d45 100644
--- a/src/main/java/ValueSet.java
+++ b/src/main/java/ValueSet.java
@@ -1,7 +1,5 @@
 import soot.Unit;
 import soot.toolkits.scalar.AbstractFlowSet;
-import soot.toolkits.scalar.ArraySparseSet;
-import soot.toolkits.scalar.FlowSet;
 import soot.toolkits.scalar.Pair;
 
 import java.util.*;
diff --git a/src/main/java/ValueSetAnalysis.java b/src/main/java/ValueSetAnalysis.java
index 31f009a..fb202a5 100644
--- a/src/main/java/ValueSetAnalysis.java
+++ b/src/main/java/ValueSetAnalysis.java
@@ -1,19 +1,13 @@
-import soot.JastAddJ.ExprStmt;
-import soot.Local;
-import soot.Scene;
 import soot.Unit;
 import soot.Value;
-import soot.jimple.AssignStmt;
 import soot.jimple.DefinitionStmt;
-import soot.jimple.internal.JAssignStmt;
-import soot.jimple.internal.JimpleLocal;
 import soot.toolkits.graph.DirectedGraph;
-import soot.toolkits.scalar.*;
+import soot.toolkits.scalar.ForwardFlowAnalysis;
+import soot.toolkits.scalar.Pair;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class ValueSetAnalysis extends ForwardFlowAnalysis<Unit, ValueSet> {
 
diff --git a/src/main/resources/privacydog.json b/src/main/resources/privacydog.json
index a404546..3ebb3c7 100644
--- a/src/main/resources/privacydog.json
+++ b/src/main/resources/privacydog.json
@@ -60,15 +60,17 @@
       }
     ]
   },
-  {"name":  "SerialNo",
-  "conditions": [
-    {
-      "stringPattern": "<android.os.Build: java.lang.String SERIAL>"
-    },
-    {
-      "stringPattern": "ro.\\S*serialno"
-    }
-  ]},
+  {
+    "name": "SerialNo",
+    "conditions": [
+      {
+        "stringPattern": "<android.os.Build: java.lang.String SERIAL>"
+      },
+      {
+        "stringPattern": "ro.\\S*serialno"
+      }
+    ]
+  },
   {
     "name": "Phone Number",
     "conditions": [
@@ -81,7 +83,6 @@
       }
     ]
   },
-
   {
     "name": "WiFi Info",
     "conditions": [
@@ -130,7 +131,6 @@
       }
     ]
   },
-
   {
     "name": "Device Admin",
     "conditions": [
@@ -161,7 +161,6 @@
       }
     ]
   },
-
   {
     "name": "SMS Send",
     "conditions": [