diff --git a/com.ibm.wala.cast.java.test.data/src/Array1.java b/com.ibm.wala.cast.java.test.data/src/Array1.java
index e27edf37b..68572fe6e 100644
--- a/com.ibm.wala.cast.java.test.data/src/Array1.java
+++ b/com.ibm.wala.cast.java.test.data/src/Array1.java
@@ -20,7 +20,6 @@ public class Array1 {
 	    ary[i]= i;
 	}
 
-	@SuppressWarnings("unused")
 	int sum = 0;
 
 	for(int j= 0; j < ary.length; j++) {
diff --git a/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java b/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java
index 1339b781f..f0f2ea9f0 100644
--- a/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java
+++ b/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java
@@ -9,7 +9,6 @@
  *     IBM Corporation - initial API and implementation
  *****************************************************************************/
 public class ArrayLiteral1 {
-    @SuppressWarnings("unused")
     public static void main(String[] args) {
       ArrayLiteral1 al1= new ArrayLiteral1();
       int[] a= new int[] { 0, 1, 2, 3, 5 };
diff --git a/com.ibm.wala.cast.java.test.data/src/ArrayLiteral2.java b/com.ibm.wala.cast.java.test.data/src/ArrayLiteral2.java
index 5071780da..6136276f3 100644
--- a/com.ibm.wala.cast.java.test.data/src/ArrayLiteral2.java
+++ b/com.ibm.wala.cast.java.test.data/src/ArrayLiteral2.java
@@ -9,7 +9,6 @@
  *     IBM Corporation - initial API and implementation
  *****************************************************************************/
 public class ArrayLiteral2 {
-    @SuppressWarnings("unused")
     public static void main(String[] args) {
 	ArrayLiteral2 al2= new ArrayLiteral2();
 	int[] x= {};
diff --git a/com.ibm.wala.cast.java.test.data/src/CastFromNull.java b/com.ibm.wala.cast.java.test.data/src/CastFromNull.java
index 9d46e2951..554b6a849 100644
--- a/com.ibm.wala.cast.java.test.data/src/CastFromNull.java
+++ b/com.ibm.wala.cast.java.test.data/src/CastFromNull.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *****************************************************************************/
 public class CastFromNull {
-  @SuppressWarnings({ "cast", "unused" })
+  @SuppressWarnings({ "cast" })
   public static void main(String args[]) {
     new CastFromNull();
     Object x = (Object) null;
diff --git a/com.ibm.wala.cast.java.test.data/src/Casts.java b/com.ibm.wala.cast.java.test.data/src/Casts.java
index f2e8a61b0..dc3271d47 100644
--- a/com.ibm.wala.cast.java.test.data/src/Casts.java
+++ b/com.ibm.wala.cast.java.test.data/src/Casts.java
@@ -14,7 +14,6 @@ public class Casts {
     (new Casts()).test(args);
   }
 
-  @SuppressWarnings("unused")
   private void test(String[] args) {
     long l1 = Long.parseLong(args[0]);
     int i1 = Integer.parseInt(args[1]);
diff --git a/com.ibm.wala.cast.java.test.data/src/DefaultConstructors.java b/com.ibm.wala.cast.java.test.data/src/DefaultConstructors.java
index fa815616e..cabd97f6d 100644
--- a/com.ibm.wala.cast.java.test.data/src/DefaultConstructors.java
+++ b/com.ibm.wala.cast.java.test.data/src/DefaultConstructors.java
@@ -11,7 +11,6 @@
 
 public class DefaultConstructors {
 	public static void main(String args[]) {
-		@SuppressWarnings("unused")
 		E e = new E();
 //		System.out.println(e.x);
 //		System.out.println(e.y);
diff --git a/com.ibm.wala.cast.java.test.data/src/Exception1.java b/com.ibm.wala.cast.java.test.data/src/Exception1.java
index d4a006513..55674f980 100644
--- a/com.ibm.wala.cast.java.test.data/src/Exception1.java
+++ b/com.ibm.wala.cast.java.test.data/src/Exception1.java
@@ -11,7 +11,6 @@
 
 public class Exception1 {
     public static void main(String[] args) {
-	@SuppressWarnings("unused")
 	Exception1 e1= new Exception1();
 	try {
 	    FooEx1 f = new FooEx1();
diff --git a/com.ibm.wala.cast.java.test.data/src/Exception2.java b/com.ibm.wala.cast.java.test.data/src/Exception2.java
index b7ee9e8d4..11f01bf40 100644
--- a/com.ibm.wala.cast.java.test.data/src/Exception2.java
+++ b/com.ibm.wala.cast.java.test.data/src/Exception2.java
@@ -17,7 +17,6 @@ public final class Exception2 {
 
   @SuppressWarnings("resource")
   public static void main(String[] args) {
-    @SuppressWarnings("unused")
     Exception2 e2= new Exception2();
     FileInputStream fis = null;
     FileOutputStream fos = null;
diff --git a/com.ibm.wala.cast.java.test.data/src/Finally1.java b/com.ibm.wala.cast.java.test.data/src/Finally1.java
index 6d63c61cc..0bbec7ff5 100644
--- a/com.ibm.wala.cast.java.test.data/src/Finally1.java
+++ b/com.ibm.wala.cast.java.test.data/src/Finally1.java
@@ -10,7 +10,6 @@
  *****************************************************************************/
 public class Finally1 {
     public static void main(String[] args) throws BadLanguageExceptionF1 {
-	@SuppressWarnings("unused")
 	Finally1 f1= new Finally1();
 	try {
 	    FooF1 f = new FooF1();
diff --git a/com.ibm.wala.cast.java.test.data/src/Inheritance1.java b/com.ibm.wala.cast.java.test.data/src/Inheritance1.java
index f52f9110b..7009f2f34 100644
--- a/com.ibm.wala.cast.java.test.data/src/Inheritance1.java
+++ b/com.ibm.wala.cast.java.test.data/src/Inheritance1.java
@@ -10,7 +10,6 @@
  *****************************************************************************/
 public class Inheritance1 {
     public static void main(String[] args) {
-	@SuppressWarnings("unused")
 	Inheritance1 ih1= new Inheritance1();
 	Base b1 = new Base();
 	Base b2 = new Derived();
@@ -23,7 +22,6 @@ public class Inheritance1 {
 }
 class Base {
     public void foo() {
-	@SuppressWarnings("unused")
 	int i= 0;
     }
     public String bar(int x) {
diff --git a/com.ibm.wala.cast.java.test.data/src/InheritedField.java b/com.ibm.wala.cast.java.test.data/src/InheritedField.java
index 8147a57d9..30bae9578 100644
--- a/com.ibm.wala.cast.java.test.data/src/InheritedField.java
+++ b/com.ibm.wala.cast.java.test.data/src/InheritedField.java
@@ -10,7 +10,6 @@
  *****************************************************************************/
 public class InheritedField {
     public static void main(String[] args) {
-	@SuppressWarnings("unused")
 	InheritedField if1= new InheritedField();
 	B b = new B();
 
diff --git a/com.ibm.wala.cast.java.test.data/src/InnerClass.java b/com.ibm.wala.cast.java.test.data/src/InnerClass.java
index 8ea47bb85..b6b3ef423 100644
--- a/com.ibm.wala.cast.java.test.data/src/InnerClass.java
+++ b/com.ibm.wala.cast.java.test.data/src/InnerClass.java
@@ -22,7 +22,6 @@ public class InnerClass {
     }
 
     public void method() {
-	@SuppressWarnings("unused")
 	WhatsIt w= new WhatsIt();
     }
 
diff --git a/com.ibm.wala.cast.java.test.data/src/InnerClassA.java b/com.ibm.wala.cast.java.test.data/src/InnerClassA.java
index 914884815..789d1487a 100644
--- a/com.ibm.wala.cast.java.test.data/src/InnerClassA.java
+++ b/com.ibm.wala.cast.java.test.data/src/InnerClassA.java
@@ -52,7 +52,6 @@ public class InnerClassA {
 			AB ab = new AB();
 			AB.ABSubA absuba = ab.new ABSubA();
 			absuba.aba_x = 7;
-			@SuppressWarnings("unused")
 			AB.ABA.ABAA abaa2 = ab.new ABA().new ABAA(); // just used to add ABA instance key in ABAA.getABA_X()
 			
 			AB.ABA aba = ab.new ABA();
diff --git a/com.ibm.wala.cast.java.test.data/src/InnerClassLexicalReads.java b/com.ibm.wala.cast.java.test.data/src/InnerClassLexicalReads.java
index e1ddd6bc9..0e50729cf 100644
--- a/com.ibm.wala.cast.java.test.data/src/InnerClassLexicalReads.java
+++ b/com.ibm.wala.cast.java.test.data/src/InnerClassLexicalReads.java
@@ -48,7 +48,6 @@ public class InnerClassLexicalReads {
 	 * 4   invokevirtual < Source, Ljava/io/PrintStream, println(I)V > v7,v8 @4 exception:v10[18:2] -> [18:38]
 	 */
 	public static void main(String args[]) {
-		@SuppressWarnings("unused")
 		InnerClassLexicalReads ignored = new InnerClassLexicalReads(); // call this just to make <init> reachable (test checks for unreachable methods)
 		int foo = 5;
 		int haha = foo * foo;
diff --git a/com.ibm.wala.cast.java.test.data/src/InterfaceTest1.java b/com.ibm.wala.cast.java.test.data/src/InterfaceTest1.java
index 5bd1963fb..bb3483edc 100644
--- a/com.ibm.wala.cast.java.test.data/src/InterfaceTest1.java
+++ b/com.ibm.wala.cast.java.test.data/src/InterfaceTest1.java
@@ -10,10 +10,8 @@
  *****************************************************************************/
 public class InterfaceTest1 {
     public static void main(String[] args) {
-	@SuppressWarnings("unused")
 	InterfaceTest1 it= new InterfaceTest1();
 	IFoo foo = new FooIT1('a');
-	@SuppressWarnings("unused")
 	char ch2 = foo.getValue();
     }
 }
diff --git a/com.ibm.wala.cast.java.test.data/src/NullArrayInit.java b/com.ibm.wala.cast.java.test.data/src/NullArrayInit.java
index bfe94866e..c43ba0880 100644
--- a/com.ibm.wala.cast.java.test.data/src/NullArrayInit.java
+++ b/com.ibm.wala.cast.java.test.data/src/NullArrayInit.java
@@ -11,7 +11,6 @@
 public class NullArrayInit {
   String[] x = {null};
 
-  @SuppressWarnings("unused")
   public static void main(String[] args) {
     new NullArrayInit();
     Object a[] = new Object[] {null,null};
diff --git a/com.ibm.wala.cast.java.test.data/src/QualifiedStatic.java b/com.ibm.wala.cast.java.test.data/src/QualifiedStatic.java
index c6e72bab0..10e9caae4 100644
--- a/com.ibm.wala.cast.java.test.data/src/QualifiedStatic.java
+++ b/com.ibm.wala.cast.java.test.data/src/QualifiedStatic.java
@@ -9,7 +9,6 @@
  *     IBM Corporation - initial API and implementation
  *****************************************************************************/
 public class QualifiedStatic {
-    @SuppressWarnings("unused")
     public static void main(String[] args) {
 	QualifiedStatic qs= new QualifiedStatic();
 	FooQ fq= new FooQ();
diff --git a/com.ibm.wala.cast.java.test.data/src/Scoping1.java b/com.ibm.wala.cast.java.test.data/src/Scoping1.java
index 4618f1d3d..7212b8ce0 100644
--- a/com.ibm.wala.cast.java.test.data/src/Scoping1.java
+++ b/com.ibm.wala.cast.java.test.data/src/Scoping1.java
@@ -10,7 +10,6 @@
  *****************************************************************************/
 public class Scoping1 {
     public static void main(String[] args) {
-	@SuppressWarnings("unused")
 	Scoping1 s1= new Scoping1();
 	{
 	    int x= 5;
diff --git a/com.ibm.wala.cast.java.test.data/src/Scoping2.java b/com.ibm.wala.cast.java.test.data/src/Scoping2.java
index 876bf6e1f..56c14a3a4 100644
--- a/com.ibm.wala.cast.java.test.data/src/Scoping2.java
+++ b/com.ibm.wala.cast.java.test.data/src/Scoping2.java
@@ -10,7 +10,6 @@
  *****************************************************************************/
 public class Scoping2 {
   public static void main(String[] args) {
-    @SuppressWarnings("unused")
     Scoping2 s2 = new Scoping2();
     {
       final int x = 5;
diff --git a/com.ibm.wala.cast.java.test.data/src/Simple1.java b/com.ibm.wala.cast.java.test.data/src/Simple1.java
index 077431fbc..422198602 100644
--- a/com.ibm.wala.cast.java.test.data/src/Simple1.java
+++ b/com.ibm.wala.cast.java.test.data/src/Simple1.java
@@ -19,7 +19,6 @@ public class Simple1 {
 	this(0);
     }
     public static void doStuff(int N) {
-	@SuppressWarnings("unused")
 	int prod = 1;
 	for(int j=0; j < N; j++)
 	    prod *= j;
diff --git a/com.ibm.wala.cast.java.test.data/src/StaticNesting.java b/com.ibm.wala.cast.java.test.data/src/StaticNesting.java
index 79bbf09ed..894c0a4cc 100644
--- a/com.ibm.wala.cast.java.test.data/src/StaticNesting.java
+++ b/com.ibm.wala.cast.java.test.data/src/StaticNesting.java
@@ -9,7 +9,6 @@
  *     IBM Corporation - initial API and implementation
  *****************************************************************************/
 public class StaticNesting {
-    @SuppressWarnings("unused")
     public static void main(String[] args) {
 	StaticNesting sn= new StaticNesting();
 	WhatsIt w= new WhatsIt();
diff --git a/com.ibm.wala.cast.java.test.data/src/TwoClasses.java b/com.ibm.wala.cast.java.test.data/src/TwoClasses.java
index 3faf0ff0c..1eb8ad684 100644
--- a/com.ibm.wala.cast.java.test.data/src/TwoClasses.java
+++ b/com.ibm.wala.cast.java.test.data/src/TwoClasses.java
@@ -18,7 +18,6 @@ public class TwoClasses {
 	this(0);
     }
     public static void doStuff(int N) {
-	@SuppressWarnings("unused")
 	int prod= 1;
 	TwoClasses tc= new TwoClasses();
 	tc.instanceMethod1();
@@ -36,7 +35,6 @@ public class TwoClasses {
 	instanceMethod2();
     }
     public void instanceMethod2() {
-	@SuppressWarnings("unused")
 	Bar b= Bar.create('a');
     }
 }
diff --git a/com.ibm.wala.cast.java.test.data/src/WhileTest1.java b/com.ibm.wala.cast.java.test.data/src/WhileTest1.java
index cd5a3c554..4eeadf2b3 100644
--- a/com.ibm.wala.cast.java.test.data/src/WhileTest1.java
+++ b/com.ibm.wala.cast.java.test.data/src/WhileTest1.java
@@ -10,7 +10,6 @@
  *****************************************************************************/
 public class WhileTest1 {
     public static void main(String[] args) {
-	@SuppressWarnings("unused")
 	WhileTest1 wt1= new WhileTest1();
 	int x= 235834;
 	boolean stop= false;
diff --git a/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java b/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java
index d5dd63583..2bf1aeb6a 100644
--- a/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java
+++ b/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java
@@ -87,7 +87,6 @@ public class InnerClassAA {
 			AB ab = new AB();
 			AB.ABSubA absuba = ab.new ABSubA();
 			absuba.aba_x = 7;
-			@SuppressWarnings("unused")
 			AB.ABA.ABAA abaa2 = ab.new ABA().new ABAA(); // just used to add ABA instance key in ABAA.getABA_X()
 			
 			AB.ABA aba = ab.new ABA();
diff --git a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ArraysAndSuch.java b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ArraysAndSuch.java
index ce540fbb4..21bb0c585 100644
--- a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ArraysAndSuch.java
+++ b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ArraysAndSuch.java
@@ -42,7 +42,7 @@ public class ArraysAndSuch {
 	public static void main(String args[]) {
 		ArraysAndSuch.main();
 	}
-	@SuppressWarnings({ "null", "unused" })
+	@SuppressWarnings("null")
 	public static void main() {
 		Object o1 = null;
 		Object[] os1 = new Object[] { null, o1, null };
diff --git a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ConstructorsAndInitializers.java b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ConstructorsAndInitializers.java
index d05d008c1..4870c002e 100644
--- a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ConstructorsAndInitializers.java
+++ b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ConstructorsAndInitializers.java
@@ -102,7 +102,6 @@ public class ConstructorsAndInitializers extends Super {
 		class T{
 			
 		}
-		@SuppressWarnings("unused")
 		T t = new T();
 	}
 }
diff --git a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/CopyOfLoopsAndLabels.java b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/CopyOfLoopsAndLabels.java
index 3db88088c..23c2b8478 100644
--- a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/CopyOfLoopsAndLabels.java
+++ b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/CopyOfLoopsAndLabels.java
@@ -40,7 +40,6 @@ package foo.bar.hello.world;
 public class CopyOfLoopsAndLabels {
 	static int X=5;
 	public static void main(String args[]) {
-		@SuppressWarnings("unused")
 		int k=X;
 		for (; ; k++)
 			break;
diff --git a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/InnerClasses.java b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/InnerClasses.java
index 149287fa9..2fe26c216 100644
--- a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/InnerClasses.java
+++ b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/InnerClasses.java
@@ -90,7 +90,6 @@ public class InnerClasses extends Temp {
 		se2.setSEVar();
 		System.out.println(sub2.hello()); //1001
 		
-		@SuppressWarnings("unused")
 		int foo = 12;
 		foo++;
 		--foo;
diff --git a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MethodMadness.java b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MethodMadness.java
index 6c512fd6e..1e6c020a7 100644
--- a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MethodMadness.java
+++ b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MethodMadness.java
@@ -51,7 +51,6 @@ public class MethodMadness {
 	public static void staticTest() {
 		System.out.println("staticTest");
 	}
-	@SuppressWarnings("static-access")
 	protected int protectedInteger() {
 		this.s = 5;
 		new MethodMadness("thrownaway").staticTest(); // MethodMadness object evaluated but thrown away
diff --git a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MiniaturList2.java b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MiniaturList2.java
index db2178168..4ffa32782 100644
--- a/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MiniaturList2.java
+++ b/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MiniaturList2.java
@@ -40,7 +40,6 @@ package foo.bar.hello.world;
 public class MiniaturList2 {
 
         public static void main(String[] args) {
-        	@SuppressWarnings("unused")
         	int a;
             for ( ;; ) {
                             break;
diff --git a/com.ibm.wala.cast.java.test.data/src/javaonepointfive/CustomGenericsAndFields.java b/com.ibm.wala.cast.java.test.data/src/javaonepointfive/CustomGenericsAndFields.java
index 6a44f4f4b..41d953815 100644
--- a/com.ibm.wala.cast.java.test.data/src/javaonepointfive/CustomGenericsAndFields.java
+++ b/com.ibm.wala.cast.java.test.data/src/javaonepointfive/CustomGenericsAndFields.java
@@ -116,13 +116,11 @@ public class CustomGenericsAndFields {
 
 		/////////////////////////////
 
-		@SuppressWarnings("unused")
 		String thrownaway = cg2.bar("a","b");
 		cg2.setFoo("real one");
 		MyGeneric<String,ConcreteGeneric2<String>> mygeneric = new MyGeneric<String,ConcreteGeneric2<String>>("useless",cg2);
 		String x = mygeneric.doFoo();
 		System.out.println(x);
-		@SuppressWarnings("unused")
 		String y = cg2.x;
 		System.out.println(mygeneric.getB().y);
 		System.out.println(mygeneric.b.y); // TODO: fields are going to be a pain... watch out for Lvalues in context?
diff --git a/com.ibm.wala.cast.java.test.data/src/javaonepointfive/ExplicitBoxingTest.java b/com.ibm.wala.cast.java.test.data/src/javaonepointfive/ExplicitBoxingTest.java
index da0c723ff..e3d807eb1 100644
--- a/com.ibm.wala.cast.java.test.data/src/javaonepointfive/ExplicitBoxingTest.java
+++ b/com.ibm.wala.cast.java.test.data/src/javaonepointfive/ExplicitBoxingTest.java
@@ -47,7 +47,6 @@ public class ExplicitBoxingTest {
 		int a = 6;
 		a = a + a;
 		System.out.println(a);
-		@SuppressWarnings("unused")
 		Integer useless1 = new Integer(5+6);
 		Integer aa = new Integer(a+a);
 		int aaa = aa.intValue();
@@ -56,7 +55,6 @@ public class ExplicitBoxingTest {
 		int b = 6;
 		b = b + b;
 		System.out.println(b);
-		@SuppressWarnings("unused")
 		Integer useless2 = 5+6;
 		Integer bb = b+b;
 		int bbb = bb;
diff --git a/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericArrays.java b/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericArrays.java
index 83910e2c7..fb22c9c5d 100644
--- a/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericArrays.java
+++ b/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericArrays.java
@@ -52,7 +52,6 @@ public class GenericArrays {
 		List<Integer> li = new ArrayList<Integer>();
 		li.add(new Integer(3));
 		oa[1] = li; // correct
-		@SuppressWarnings("unused")
 		String s = (String) lsa[1].get(0); // run time error, but cast is explicit
 
 	}
diff --git a/com.ibm.wala.cast.java.test.data/src/javaonepointfive/TypeInferencePrimAndStringOp.java b/com.ibm.wala.cast.java.test.data/src/javaonepointfive/TypeInferencePrimAndStringOp.java
index d5ab2997e..1cd765235 100644
--- a/com.ibm.wala.cast.java.test.data/src/javaonepointfive/TypeInferencePrimAndStringOp.java
+++ b/com.ibm.wala.cast.java.test.data/src/javaonepointfive/TypeInferencePrimAndStringOp.java
@@ -13,7 +13,6 @@ package javaonepointfive;
 public class TypeInferencePrimAndStringOp {
   public static void main(String[] args) {
     int a = 2;
-    @SuppressWarnings("unused")
     String result = "a" + a;
   }
 }
diff --git a/com.ibm.wala.cast.java.test.data/src/p/NonPrimaryTopLevel.java b/com.ibm.wala.cast.java.test.data/src/p/NonPrimaryTopLevel.java
index eb8470714..2ada3e70b 100644
--- a/com.ibm.wala.cast.java.test.data/src/p/NonPrimaryTopLevel.java
+++ b/com.ibm.wala.cast.java.test.data/src/p/NonPrimaryTopLevel.java
@@ -11,7 +11,6 @@
 package p;
 
 public class NonPrimaryTopLevel {
-    @SuppressWarnings("unused")
     public static void main(String[] args) {
 	NonPrimaryTopLevel nptl= new NonPrimaryTopLevel();
 	Foo f = new Foo();
diff --git a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java
index 05238fdb8..af3d14e80 100644
--- a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java
+++ b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java
@@ -67,11 +67,11 @@ public abstract class JavaIRTests extends IRTests {
   @Test public void testSimple1() throws IllegalArgumentException, CancelException, IOException {
 
     List<? extends IRAssertion> assertions = Arrays.asList(
-        new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "prod", 25),
-        new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "j", 24), 
-        new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "s", 33), 
-        new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "i", 29), 
-        new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "sum", 30), 
+        new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "prod", 24),
+        new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "j", 23),
+        new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "s", 32), 
+        new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "i", 28), 
+        new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "sum", 29), 
         EdgeAssertions.make("Source#Simple1#main#([Ljava/lang/String;)V", "Source#Simple1#doStuff#(I)V"), 
         EdgeAssertions.make("Source#Simple1#instanceMethod1#()V", "Source#Simple1#instanceMethod2#()V"));
 
diff --git a/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
index 5bcd884b8..de84fc474 100644
--- a/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
@@ -118,7 +118,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/com.ibm.wala.core.testdata/src/recurse/NList.java b/com.ibm.wala.core.testdata/src/recurse/NList.java
index bd7a645ad..9ea34182c 100644
--- a/com.ibm.wala.core.testdata/src/recurse/NList.java
+++ b/com.ibm.wala.core.testdata/src/recurse/NList.java
@@ -69,7 +69,6 @@ public class NList implements Collection {
    * @see java.util.Collection#iterator()
    */
   @Override
-  @SuppressWarnings("rawtypes")
   public Iterator iterator() {
     // TODO Auto-generated method stub
     return null;