diff --git a/src/java/com/samskivert/depot/Key.java b/src/java/com/samskivert/depot/Key.java
index b91ff71..818ced6 100644
--- a/src/java/com/samskivert/depot/Key.java
+++ b/src/java/com/samskivert/depot/Key.java
@@ -36,7 +36,6 @@ import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.depot.impl.DepotMarshaller;
 import com.samskivert.depot.impl.DepotUtil;
 import com.samskivert.depot.impl.ExpressionVisitor;
-import com.samskivert.depot.impl.KeyCacheKey;
 
 /**
  * A special form of {@link WhereClause} that uniquely specifies a single database row and thus
diff --git a/src/java/com/samskivert/depot/KeySet.java b/src/java/com/samskivert/depot/KeySet.java
index 9754cca..6a9488d 100644
--- a/src/java/com/samskivert/depot/KeySet.java
+++ b/src/java/com/samskivert/depot/KeySet.java
@@ -39,7 +39,6 @@ import com.samskivert.depot.expression.LiteralExp;
 import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.depot.impl.DepotUtil;
 import com.samskivert.depot.impl.ExpressionVisitor;
-import com.samskivert.depot.impl.KeyCacheKey;
 import com.samskivert.depot.operator.In;
 import com.samskivert.depot.operator.Or;
 
diff --git a/src/java/com/samskivert/depot/tools/GenRecordTask.java b/src/java/com/samskivert/depot/tools/GenRecordTask.java
index 851a247..9afeef7 100644
--- a/src/java/com/samskivert/depot/tools/GenRecordTask.java
+++ b/src/java/com/samskivert/depot/tools/GenRecordTask.java
@@ -26,7 +26,6 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.StringWriter;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
diff --git a/src/java/com/samskivert/depot/util/ByteEnumUtil.java b/src/java/com/samskivert/depot/util/ByteEnumUtil.java
index 8a6bd5d..1dce570 100644
--- a/src/java/com/samskivert/depot/util/ByteEnumUtil.java
+++ b/src/java/com/samskivert/depot/util/ByteEnumUtil.java
@@ -38,8 +38,7 @@ public class ByteEnumUtil
     public static <E extends Enum<E> & ByteEnum> E fromByte (Class<E> eclass, byte code)
     {
         for (E value : EnumSet.allOf(eclass)) {
-            ByteEnum bvalue = (ByteEnum)value;
-            if (bvalue.toByte() == code) {
+            if (value.toByte() == code) {
                 return value;
             }
         }