diff --git a/gson/src/main/java/com/google/gson/MappedObjectConstructor.java b/gson/src/main/java/com/google/gson/MappedObjectConstructor.java
index a5fc6389..a55e7c4d 100644
--- a/gson/src/main/java/com/google/gson/MappedObjectConstructor.java
+++ b/gson/src/main/java/com/google/gson/MappedObjectConstructor.java
@@ -16,18 +16,16 @@
 
 package com.google.gson;
 
-import sun.misc.Unsafe;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import sun.misc.Unsafe;
+
 /**
  * This class contains a mapping of all the application specific
  * {@link InstanceCreator} instances.  Registering an {@link InstanceCreator}
diff --git a/gson/src/test/java/com/google/gson/FunctionWithInternalDependenciesTest.java b/gson/src/test/java/com/google/gson/FunctionWithInternalDependenciesTest.java
index 1109c880..5e1862a0 100644
--- a/gson/src/test/java/com/google/gson/FunctionWithInternalDependenciesTest.java
+++ b/gson/src/test/java/com/google/gson/FunctionWithInternalDependenciesTest.java
@@ -21,7 +21,6 @@ import java.util.LinkedList;
 
 import junit.framework.TestCase;
 
-import com.google.gson.common.TestTypes;
 import com.google.gson.common.TestTypes.ClassWithNoFields;
 
 /**
diff --git a/gson/src/test/java/com/google/gson/MappedObjectConstructorTest.java b/gson/src/test/java/com/google/gson/MappedObjectConstructorTest.java
index 81e918a6..8bd5d860 100644
--- a/gson/src/test/java/com/google/gson/MappedObjectConstructorTest.java
+++ b/gson/src/test/java/com/google/gson/MappedObjectConstructorTest.java
@@ -16,12 +16,10 @@
 
 package com.google.gson;
 
-import com.google.gson.common.TestTypes.CrazyLongTypeAdapter;
+import java.lang.reflect.Type;
 
 import junit.framework.TestCase;
 
-import java.lang.reflect.Type;
-
 /**
  * Unit tests for the {@link MappedObjectConstructor} class.
  *
@@ -82,6 +80,7 @@ public class MappedObjectConstructorTest extends TestCase {
   }
   
   private static class ObjectNoDefaultConstructor extends ObjectWithDefaultConstructor {
+    @SuppressWarnings("unused")
     public ObjectNoDefaultConstructor(String stringValue, int intValue) {
       super(stringValue, intValue);
     }