diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index 28b582542..91cb81c65 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -250,9 +250,6 @@ public final class ActFmSyncService {
         if(params.size() == 0 || !checkForToken())
             return;
 
-        System.err.println("PUSHN ON SAVE: " + task.getMergedValues());
-        System.err.println("SETVALUES: " + values);
-
         if(!newlyCreated) {
             params.add("id"); params.add(remoteId);
         } else if(!params.contains(Task.TITLE.name))
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
index 04517e0fd..0696c9961 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
@@ -45,6 +45,7 @@ public class GtasksPreferenceService extends SyncProviderUtilities {
     /** GTasks whether we have shown list help boolean */
     public static final String PREF_SHOWN_LIST_HELP = IDENTIFIER + "_list_help"; //$NON-NLS-1$
 
-    public static final String PREF_MIGRATION_HAS_OCCURRED = IDENTIFIER + "_migrated";
+    /** Pref that is set once migration to new GTasks API has occurred */
+    public static final String PREF_MIGRATION_HAS_OCCURRED = IDENTIFIER + "_migrated"; //$NON-NLS-1$
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
index 9f83c4a4b..e9cad5e41 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
@@ -67,7 +67,7 @@ public class GtasksPreferences extends SyncProviderPreferences {
         if (r.getString(R.string.gtasks_GPr_sync_on_save_key).equals(preference.getKey())) {
             preference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                 @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                public boolean onPreferenceChange(Preference changed, Object newValue) {
                     if (((Boolean) newValue).booleanValue()) {
                         startSync();
                     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
index a379433f9..3f3ac3b52 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
@@ -254,6 +254,7 @@ public class GtasksTaskListUpdater {
         });
     }
 
+    @SuppressWarnings("nls")
     public void debugPrint(Node root, int depth) {
         for(int i = 0; i < depth; i++) System.err.print(" + ");
         System.err.format("%03d", root.taskId);
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncOnSaveService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncOnSaveService.java
index 056283ccb..3efd8b3c2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncOnSaveService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncOnSaveService.java
@@ -44,7 +44,7 @@ public final class GtasksSyncOnSaveService {
 
     private final LinkedBlockingQueue<SyncOnSaveOperation> operationQueue = new LinkedBlockingQueue<SyncOnSaveOperation>();
 
-    private abstract class SyncOnSaveOperation {}
+    private abstract class SyncOnSaveOperation { /**/ }
 
     private class TaskPushOp extends SyncOnSaveOperation {
         protected Task model;
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 384690228..2d2609440 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -257,7 +257,7 @@
   <string name="TEA_urgency_none">None</string>
   
   <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide Until</string>
+  <string name="TEA_hideUntil_label">Hide Task From List Until:</string>
   
   <!-- Task editing data being loaded label -->
   <string-array name="TEA_loading"><item>Loading...</item></string-array>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 15797cfa6..a41f3acf6 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -221,8 +221,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
         setUpUiComponents();
         onNewIntent(getIntent());
 
-        AndroidUtilities.copyDatabases(this, "/sdcard/astrid");
-
         Eula.showEula(this);
 
         if(getIntent().hasExtra(TOKEN_SOURCE)) {