diff --git a/emailcommon/src/com/android/emailcommon/Device.java b/emailcommon/src/com/android/emailcommon/Device.java
index fb9847fa8..ce2c88617 100644
--- a/emailcommon/src/com/android/emailcommon/Device.java
+++ b/emailcommon/src/com/android/emailcommon/Device.java
@@ -87,8 +87,6 @@ public class Device {
         }
         w.write(id);
         w.close();
-        // STOPSHIP Remove logging
-        Log.w(Logging.LOG_TAG, "deviceId written as: " + id);
         return id;
     }
 
diff --git a/emailcommon/src/com/android/emailcommon/internet/MimeUtility.java b/emailcommon/src/com/android/emailcommon/internet/MimeUtility.java
index 51b333573..3e1488da6 100644
--- a/emailcommon/src/com/android/emailcommon/internet/MimeUtility.java
+++ b/emailcommon/src/com/android/emailcommon/internet/MimeUtility.java
@@ -383,7 +383,7 @@ public class MimeUtility {
         try {
             IOUtils.copy(in, out);
         } catch (Base64DataException bde) {
-            // STOPSHIP Need to fix this somehow
+            // TODO Need to fix this somehow
             //String warning = "\n\n" + Email.getMessageDecodeErrorString();
             //out.write(warning.getBytes());
         } finally {
diff --git a/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
index 0be702a31..45e868a2e 100644
--- a/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
+++ b/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
@@ -25,7 +25,7 @@ import android.os.RemoteException;
 import android.util.Log;
 
 public class PolicyServiceProxy extends ServiceProxy implements IPolicyService {
-    private static final boolean DEBUG_PROXY = true; // STOPSHIP DO NOT CHECK THIS IN SET TO TRUE
+    private static final boolean DEBUG_PROXY = false; // DO NOT CHECK THIS IN SET TO TRUE
     private static final String TAG = "PolicyServiceProxy";
 
     // The intent used by sync adapter services to connect to the PolicyService
diff --git a/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
index 4e80c6980..925074237 100644
--- a/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
+++ b/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
@@ -42,7 +42,7 @@ import android.util.Log;
  */
 
 public abstract class ServiceProxy {
-    private static final boolean DEBUG_PROXY = true; // STOPSHIP DO NOT CHECK THIS IN SET TO TRUE
+    private static final boolean DEBUG_PROXY = false; // DO NOT CHECK THIS IN SET TO TRUE
     private final String mTag;
 
     private final Context mContext;