diff --git a/emailsync/src/com/android/emailsync/MessageMoveRequest.java b/emailsync/src/com/android/emailsync/MessageMoveRequest.java
index 3f783a40d..a741a982b 100644
--- a/emailsync/src/com/android/emailsync/MessageMoveRequest.java
+++ b/emailsync/src/com/android/emailsync/MessageMoveRequest.java
@@ -31,11 +31,13 @@ public class MessageMoveRequest extends Request {
 
     // MessageMoveRequests are unique by their message id (i.e. it's meaningless to have two
     // separate message moves queued at the same time)
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof MessageMoveRequest)) return false;
         return ((MessageMoveRequest)o).mMessageId == mMessageId;
     }
 
+    @Override
     public int hashCode() {
         return (int)mMessageId;
     }
diff --git a/emailsync/src/com/android/emailsync/PartRequest.java b/emailsync/src/com/android/emailsync/PartRequest.java
index ce0070f18..31e801023 100644
--- a/emailsync/src/com/android/emailsync/PartRequest.java
+++ b/emailsync/src/com/android/emailsync/PartRequest.java
@@ -40,11 +40,13 @@ public class PartRequest extends Request {
 
     // PartRequests are unique by their attachment id (i.e. multiple attachments might be queued
     // for a particular message, but any individual attachment can only be loaded once)
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof PartRequest)) return false;
         return ((PartRequest)o).mAttachment.mId == mAttachment.mId;
     }
 
+    @Override
     public int hashCode() {
         return (int)mAttachment.mId;
     }
diff --git a/emailsync/src/com/android/emailsync/Request.java b/emailsync/src/com/android/emailsync/Request.java
index f686a36cc..655b301f7 100644
--- a/emailsync/src/com/android/emailsync/Request.java
+++ b/emailsync/src/com/android/emailsync/Request.java
@@ -31,6 +31,8 @@ public abstract class Request {
 
     // Subclasses of Request may have different semantics regarding equality; therefore,
     // we force them to implement the equals method
+    @Override
     public abstract boolean equals(Object o);
+    @Override
     public abstract int hashCode();
 }
diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java
index acdcc5c4e..1dda35afe 100644
--- a/emailsync/src/com/android/emailsync/SyncManager.java
+++ b/emailsync/src/com/android/emailsync/SyncManager.java
@@ -38,7 +38,6 @@ import android.os.Handler;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.Process;
-import android.os.RemoteException;
 import android.provider.CalendarContract;
 import android.provider.CalendarContract.Calendars;
 import android.provider.CalendarContract.Events;
@@ -59,7 +58,6 @@ import com.android.emailcommon.provider.Policy;
 import com.android.emailcommon.provider.ProviderUnavailableException;
 import com.android.emailcommon.service.AccountServiceProxy;
 import com.android.emailcommon.service.EmailServiceProxy;
-import com.android.emailcommon.service.EmailServiceStatus;
 import com.android.emailcommon.service.IEmailServiceCallback.Stub;
 import com.android.emailcommon.service.PolicyServiceProxy;
 import com.android.emailcommon.utility.EmailClientConnectionManager;