diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java
index 29df48da9..3f487750d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java
@@ -30,7 +30,7 @@ public class NoteDetailExposer extends BroadcastReceiver {
             return;
 
         boolean extended = intent.getBooleanExtra(AstridApiConstants.EXTRAS_EXTENDED, false);
-        String taskDetail = getTaskDetails(context, taskId, extended);
+        String taskDetail = getTaskDetails(taskId, extended);
         if(taskDetail == null)
             return;
 
@@ -43,7 +43,7 @@ public class NoteDetailExposer extends BroadcastReceiver {
         context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
     }
 
-    public String getTaskDetails(Context context, long id, boolean extended) {
+    public String getTaskDetails(long id, boolean extended) {
 
         if(Preferences.getBoolean(R.string.p_showNotes, false)) {
             if(extended)
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java
index 26e7feeac..53f2aa993 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java
@@ -13,11 +13,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemSelectedListener;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
@@ -98,11 +98,12 @@ public class ProducteevControlSet implements TaskEditControlSet {
                                         context.getString(R.string.DLG_wait));
                                 try {
                                     progressDialog.show();
-                                    JSONObject newDashJSON = ProducteevSyncProvider.getInvoker().dashboardsCreate(newDashboardName).getJSONObject("dashboard");
+                                    JSONObject newDashJSON = ProducteevSyncProvider.getInvoker().dashboardsCreate(
+                                            newDashboardName).getJSONObject("dashboard"); //$NON-NLS-1$
                                     StoreObject local = ProducteevDataService.getInstance().updateDashboards(newDashJSON, true);
                                     if (local != null) {
                                         ProducteevDashboard newDashboard = new ProducteevDashboard(local);
-                                        ArrayAdapter adapter = (ArrayAdapter) dashSelector.getAdapter();
+                                        ArrayAdapter<ProducteevDashboard> adapter = (ArrayAdapter<ProducteevDashboard>) dashSelector.getAdapter();
                                         adapter.insert(newDashboard, adapter.getCount()-1);
                                         dashSelector.setSelection(adapter.getCount()-2);
                                         refreshResponsibleSpinner(newDashboard.getUsers());
@@ -114,8 +115,8 @@ public class ProducteevControlSet implements TaskEditControlSet {
                                             context.getString(R.string.DLG_error, e.getMessage()),
                                             new OnClickListener() {
                                                 @Override
-                                                public void onClick(DialogInterface dialog, int which) {
-                                                    dialog.dismiss();
+                                                public void onClick(DialogInterface theDialog, int theWhich) {
+                                                    theDialog.dismiss();
                                                 }
                                             });
                                     e.printStackTrace();
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
index 35622814e..328f54610 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
@@ -35,7 +35,6 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.activity.ShortcutActivity;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.api.TaskContainer;
 import com.todoroo.astrid.common.SyncProvider;
 import com.todoroo.astrid.common.TaskContainer;
 import com.todoroo.astrid.model.Metadata;