diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml
index 42b629f19..8d37a4a92 100644
--- a/astrid/src/main/AndroidManifest.xml
+++ b/astrid/src/main/AndroidManifest.xml
@@ -375,10 +375,6 @@
             android:windowSoftInputMode="stateHidden"
             android:theme="@style/Tasks.Dialog" />
 
-        <activity
-            android:name="com.todoroo.astrid.actfm.CommentsActivity"
-            android:windowSoftInputMode="stateHidden" />
-
         <!-- gtasks -->
         <activity
             android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity"
diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java
deleted file mode 100644
index fe8c89be9..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.actfm;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBar;
-import android.view.MenuItem;
-
-import com.todoroo.andlib.utility.AndroidUtilities;
-import com.todoroo.astrid.activity.AstridActivity;
-import com.todoroo.astrid.service.ThemeService;
-
-import org.tasks.R;
-
-public class CommentsActivity extends AstridActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        ThemeService.applyTheme(this);
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.tag_updates_activity);
-
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setTitle(R.string.TAd_contextEditTask);
-
-        Fragment fragment;
-        String tag;
-        if (getIntent().getExtras().containsKey(TaskCommentsFragment.EXTRA_TASK)) {
-            fragment = new TaskCommentsFragment();
-            tag = "taskupdates_fragment"; //$NON-NLS-1$
-        } else {
-            fragment = new TagCommentsFragment();
-            tag = "tagupdates_fragment"; //$NON-NLS-1$
-        }
-
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        transaction.add(R.id.comments_fragment_container, fragment, tag);
-        transaction.commit();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch(item.getItemId()) {
-        case android.R.id.home:
-            finish();
-            break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void finish() {
-        super.finish();
-        AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_right_in, R.anim.slide_right_out);
-    }
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java
index e41ce1ac1..715725e5c 100644
--- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java
@@ -11,7 +11,6 @@ import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
-import android.support.v7.app.ActionBar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -37,7 +36,6 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
 import com.todoroo.astrid.actfm.ActFmCameraModule.ClearImageCallback;
-import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.adapter.UpdateAdapter;
 import com.todoroo.astrid.dao.UserActivityDao;
@@ -49,7 +47,6 @@ import org.tasks.R;
 
 public abstract class CommentsFragment extends ListFragment {
 
-//    private TagData tagData;
     protected UpdateAdapter updateAdapter;
     protected EditText addCommentField;
     protected ViewGroup listHeader;
@@ -61,9 +58,6 @@ public abstract class CommentsFragment extends ListFragment {
 
     public static final String TAG_UPDATES_FRAGMENT = "tagupdates_fragment"; //$NON-NLS-1$
 
-    //Append tag data remote id to this preference
-    public static final String UPDATES_LAST_VIEWED = "updates_last_viewed_"; //$NON-NLS-1$
-
     protected static final int MENU_REFRESH_ID = Menu.FIRST;
 
     @Autowired UserActivityDao userActivityDao;
@@ -86,8 +80,6 @@ public abstract class CommentsFragment extends ListFragment {
 
     protected abstract boolean hasModel();
 
-    protected abstract String getModelName();
-
     protected abstract Cursor getCursor();
 
     protected abstract void addHeaderToListView(ListView listView);
@@ -121,13 +113,6 @@ public abstract class CommentsFragment extends ListFragment {
     }
 
     protected void setUpUpdateList() {
-        if (getActivity() instanceof CommentsActivity) {
-            ActionBar ab = ((AstridActivity) getActivity()).getSupportActionBar();
-            String title = hasModel() ? getString(R.string.tag_updates_title, getModelName())
-                    : getString(R.string.TLA_all_activity);
-            ab.setTitle(title);
-        }
-
         final ImageButton commentButton = (ImageButton) getView().findViewById(R.id.commentButton);
         addCommentField = (EditText) getView().findViewById(R.id.commentField);
         addCommentField.setOnEditorActionListener(new OnEditorActionListener() {
@@ -218,10 +203,6 @@ public abstract class CommentsFragment extends ListFragment {
         }
 
         listView.setVisibility(View.VISIBLE);
-
-        if (activity instanceof CommentsActivity) {
-            setLastViewed();
-        }
     }
 
     private void addFooterToListView(ListView listView) {
@@ -231,10 +212,6 @@ public abstract class CommentsFragment extends ListFragment {
         footerView = null;
     }
 
-    protected void setLastViewed() {
-        //
-    }
-
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if(menu.size() > 0) {
diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java
index cad8f46de..789bcf647 100644
--- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java
@@ -12,8 +12,6 @@ import android.widget.ListView;
 
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.UserActivity;
@@ -58,11 +56,6 @@ public class TagCommentsFragment extends CommentsFragment {
         return tagData != null;
     }
 
-    @Override
-    protected String getModelName() {
-        return tagData.getValue(TagData.NAME);
-    }
-
     @Override
     protected Cursor getCursor() {
         return tagDataService.getActivityForTagData(tagData);
@@ -87,11 +80,4 @@ public class TagCommentsFragment extends CommentsFragment {
         userActivity.setValue(UserActivity.CREATED_AT, DateUtilities.now());
         return userActivity;
     }
-
-    @Override
-    protected void setLastViewed() {
-        if(tagData != null && RemoteModel.isValidUuid(tagData.getValue(TagData.UUID))) {
-            Preferences.setLong(UPDATES_LAST_VIEWED + tagData.getValue(TagData.UUID), DateUtilities.now());
-        }
-    }
 }
diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java
deleted file mode 100644
index 59ddec0cf..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.todoroo.astrid.actfm;
-
-import android.content.Intent;
-import android.database.Cursor;
-import android.widget.ListView;
-
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.astrid.dao.TaskDao;
-import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.data.UserActivity;
-import com.todoroo.astrid.service.TaskService;
-
-import org.tasks.R;
-
-public class TaskCommentsFragment extends CommentsFragment {
-
-    public static final String EXTRA_TASK = "extra_task"; //$NON-NLS-1$
-
-    @Autowired
-    private TaskDao taskDao;
-
-    private Task task;
-
-    @Autowired
-    private TaskService taskService;
-
-    public TaskCommentsFragment() {
-        super();
-    }
-
-    @Override
-    protected void loadModelFromIntent(Intent intent) {
-        if (task == null) {
-            long taskId = intent.getLongExtra(EXTRA_TASK, 0L);
-            task = taskDao.fetch(taskId, Task.PROPERTIES);
-        }
-    }
-
-    @Override
-    protected boolean hasModel() {
-        return task != null;
-    }
-
-    @Override
-    protected int getLayout() {
-        return R.layout.tag_updates_fragment;
-    }
-
-    @Override
-    protected String getModelName() {
-        return task.getValue(Task.TITLE);
-    }
-
-    @Override
-    protected Cursor getCursor() {
-        return taskService.getActivityForTask(task);
-    }
-
-    @Override
-    protected void addHeaderToListView(ListView listView) {
-        // Do nothing
-    }
-
-    @Override
-    protected UserActivity createUpdate() {
-        UserActivity update = new UserActivity();
-        update.setValue(UserActivity.MESSAGE, addCommentField.getText().toString());
-        update.setValue(UserActivity.ACTION, UserActivity.ACTION_TASK_COMMENT);
-        update.setValue(UserActivity.USER_UUID, Task.USER_ID_SELF);
-        update.setValue(UserActivity.TARGET_ID, task.getUuid());
-        update.setValue(UserActivity.TARGET_NAME, task.getValue(Task.TITLE));
-        update.setValue(UserActivity.CREATED_AT, DateUtilities.now());
-        return update;
-    }
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 3d31e953a..338bbeb6e 100755
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -50,8 +50,6 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.ActFmCameraModule;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
-import com.todoroo.astrid.actfm.CommentsActivity;
-import com.todoroo.astrid.actfm.TaskCommentsFragment;
 import com.todoroo.astrid.dao.TaskAttachmentDao;
 import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.Task;
@@ -150,8 +148,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     private static final int MENU_SAVE_ID = R.string.TEA_menu_save;
     private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;
-    private static final int MENU_COMMENTS_REFRESH_ID = R.string.TEA_menu_refresh_comments;
-    private static final int MENU_SHOW_COMMENTS_ID = R.string.TEA_menu_comments;
     private static final int MENU_ATTACH_ID = R.string.premium_attach_file;
     private static final int MENU_RECORD_ID = R.string.premium_record_audio;
     private static final int MENU_DELETE_TASK_ID = R.string.delete_task;
@@ -933,16 +929,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         case MENU_DELETE_TASK_ID:
             deleteButtonClick();
             return true;
-        case MENU_COMMENTS_REFRESH_ID: {
-            return true;
-        }
-        case MENU_SHOW_COMMENTS_ID: {
-            Intent intent = new Intent(getActivity(), CommentsActivity.class);
-            intent.putExtra(TaskCommentsFragment.EXTRA_TASK, model.getId());
-            startActivity(intent);
-            AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out);
-            return true;
-        }
         case android.R.id.home:
             if (title.getText().length() == 0) {
                 discardButtonClick();
diff --git a/astrid/src/main/res/layout/tag_updates_activity.xml b/astrid/src/main/res/layout/tag_updates_activity.xml
deleted file mode 100644
index 62dc0ce4e..000000000
--- a/astrid/src/main/res/layout/tag_updates_activity.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/comments_fragment_container">
-</FrameLayout>
diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml
index fb5f35846..eac6c8c5f 100644
--- a/astrid/src/main/res/values-ca/strings.xml
+++ b/astrid/src/main/res/values-ca/strings.xml
@@ -80,7 +80,6 @@
 		<item>prioritat mitjana</item>
 		<item>prioritat baixa</item>
 	</string-array>
-	<string name="TLA_all_activity">Tota l\'activitat</string>
 	<string name="TAd_hiddenFormat">%s [ocult]</string>
 	<string name="TAd_deletedFormat">%s [eliminat]</string>
 	<string name="TAd_completed">Acabat fa\n%s</string>
@@ -120,7 +119,6 @@
 	<string name="TEA_elapsedDuration_label">Temps que ja s\'ha invertit en la Tasca</string>
 	<string name="TEA_menu_save">Desa els canvis</string>
 	<string name="TEA_menu_discard">No ho desis</string>
-	<string name="TEA_menu_comments">Comentaris</string>
 	<string name="TEA_tab_activity">Activitat</string>
 	<string-array name="TEA_urgency">
 		<item>Sense venciment</item>
@@ -295,7 +293,6 @@
 	<string name="tag_cm_delete">Suprimeix la llista</string>
 	<string name="DLG_delete_this_tag_question">Voleu suprimir aquesta llista: %s? (no se suprimirà cap tasca.)</string>
 	<string name="tag_settings_title">Paràmetres:</string>
-	<string name="tag_updates_title">Activitat: %s</string>
 	<string name="TPl_notification">Temporitzadors actius per %s!</string>
 	<string name="TFE_workingOn">Tasques sent cronometrades</string>
 	<string name="TEA_timer_comment_started">inici d\'aquesta tasca:</string>
diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml
index 2a1d82183..53945c82b 100644
--- a/astrid/src/main/res/values-cs/strings.xml
+++ b/astrid/src/main/res/values-cs/strings.xml
@@ -112,7 +112,6 @@
 	<string name="TEA_elapsedDuration_label">Jak dlouho už na úkolu pracujete</string>
 	<string name="TEA_menu_save">Uložit změny</string>
 	<string name="TEA_menu_discard">Neukládat</string>
-	<string name="TEA_menu_comments">Komentáře</string>
 	<string name="TEA_tab_activity">Činnost</string>
 	<string-array name="TEA_urgency">
 		<item>Bez termínu</item>
diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml
index 25366fb36..f3633d572 100644
--- a/astrid/src/main/res/values-de/strings.xml
+++ b/astrid/src/main/res/values-de/strings.xml
@@ -72,7 +72,6 @@
 		<item>mittlere Priorität</item>
 		<item>niedrige Priorität</item>
 	</string-array>
-	<string name="TLA_all_activity">Alle Aktivitäten</string>
 	<string name="TAd_hiddenFormat">%s [versteckt]</string>
 	<string name="TAd_deletedFormat">%s [gelöscht]</string>
 	<string name="TAd_completed">Abgeschlossen\n%s</string>
@@ -116,8 +115,6 @@
 	<string name="TEA_elapsedDuration_label">Zeit, die schon für die Aufgabe gebraucht wurde</string>
 	<string name="TEA_menu_save">Änderungen speichern</string>
 	<string name="TEA_menu_discard">Nicht speichern</string>
-	<string name="TEA_menu_refresh_comments">Kommentare aktualisieren</string>
-	<string name="TEA_menu_comments">Kommentare</string>
 	<string name="TEA_tab_activity">Aktivität</string>
 	<string-array name="TEA_urgency">
 		<item>Kein Datum</item>
@@ -607,7 +604,6 @@
 	<string name="TEA_tags_deleted">Löschen der Liste %1$s beeinflusste %2$d Aufgaben</string>
 	<string name="TEA_tags_renamed">%1$s umbennant nach %2$s für %3$d Aufgaben</string>
 	<string name="tag_settings_title">Listeneinstellungen</string>
-	<string name="tag_updates_title">Aktivität: %s</string>
 	<string name="TPl_notification">Timer ist aktiv für %s!</string>
 	<string name="TFE_workingOn">Zeitlich festgelegte Aufgaben</string>
 	<string name="TEA_timer_comment_started">Aufgabe begonnen:</string>
diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml
index e1f130adf..dde255a91 100644
--- a/astrid/src/main/res/values-es/strings.xml
+++ b/astrid/src/main/res/values-es/strings.xml
@@ -78,7 +78,6 @@
 		<item>prioridad media</item>
 		<item>prioridad baja</item>
 	</string-array>
-	<string name="TLA_all_activity">Toda la actividad</string>
 	<string name="TAd_hiddenFormat">%s [oculto]</string>
 	<string name="TAd_deletedFormat">%s [borrado]</string>
 	<string name="TAd_completed">Terminado\n%s</string>
@@ -122,8 +121,6 @@
 	<string name="TEA_elapsedDuration_label">Tiempo ya empleado en la tarea</string>
 	<string name="TEA_menu_save">Guardar cambios</string>
 	<string name="TEA_menu_discard">No guardar</string>
-	<string name="TEA_menu_refresh_comments">Actualizar comentarios</string>
-	<string name="TEA_menu_comments">Comentarios</string>
 	<string name="TEA_tab_activity">Actividad</string>
 	<string name="TEA_timer_est">Estimado %s</string>
 	<string name="TEA_timer_elap">Transcurrido %s</string>
@@ -622,7 +619,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n</string>
 	<string name="TEA_tags_deleted">La lista %1$s fue eliminada, afectando %2$d tareas</string>
 	<string name="TEA_tags_renamed">Renombrada %1$s como %2$s en %3$d tareas</string>
 	<string name="tag_settings_title">Configuración de lista</string>
-	<string name="tag_updates_title">Actividad: %s</string>
 	<string name="TPl_notification">Temporizadores activos para %s!</string>
 	<string name="TFE_workingOn">Tareas que se están cronometrando</string>
 	<string name="TEA_timer_controls">Temporizador</string>
diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml
index dea0f3eb6..d1cca43e9 100644
--- a/astrid/src/main/res/values-fr/strings.xml
+++ b/astrid/src/main/res/values-fr/strings.xml
@@ -76,7 +76,6 @@
 		<item>Priorité ,oyenne</item>
 		<item>Priorité basse</item>
 	</string-array>
-	<string name="TLA_all_activity">Toute activité</string>
 	<string name="TAd_hiddenFormat">%s [masqué(e)]</string>
 	<string name="TAd_deletedFormat">%s [supprimé(e)]</string>
 	<string name="TAd_completed">Accomplie\n%s</string>
@@ -119,8 +118,6 @@
 	<string name="TEA_elapsedDuration_label">Temps déjà passé sur la tâche</string>
 	<string name="TEA_menu_save">Sauvegarder les modifications</string>
 	<string name="TEA_menu_discard">Ne pas enregistrer</string>
-	<string name="TEA_menu_refresh_comments">Mettre à jour les commentaires</string>
-	<string name="TEA_menu_comments">Commentaires</string>
 	<string name="TEA_tab_activity">Activité</string>
 	<string name="TEA_timer_est">Restant %s</string>
 	<string name="TEA_timer_elap">Passé %s</string>
@@ -618,7 +615,6 @@
 	<string name="TEA_tags_deleted">La liste %1$s a été supprimée, affectant %2$d tâches</string>
 	<string name="TEA_tags_renamed">%1$s renommé en %2$s pour %3$d tâches</string>
 	<string name="tag_settings_title">Settings:</string>
-	<string name="tag_updates_title">Activité : %s</string>
 	<string name="TPl_notification">Chronomètre actif pour %s !</string>
 	<string name="TFE_workingOn">Tâches chronométrées</string>
 	<string name="TEA_timer_comment_started">Cette tâche est commencée :</string>
diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml
index 41451dfcf..3f59e1059 100644
--- a/astrid/src/main/res/values-it/strings.xml
+++ b/astrid/src/main/res/values-it/strings.xml
@@ -75,7 +75,6 @@
 		<item>priorità media</item>
 		<item>priorità bassa</item>
 	</string-array>
-	<string name="TLA_all_activity">Tutte le Attività</string>
 	<string name="TAd_hiddenFormat">%s [Nascosto]</string>
 	<string name="TAd_deletedFormat">%s [eliminato]</string>
 	<string name="TAd_completed">Terminata\n%s</string>
@@ -111,7 +110,6 @@
 	<string name="TEA_elapsedDuration_label">Tempo già speso per l\'attività</string>
 	<string name="TEA_menu_save">Salva le modifiche</string>
 	<string name="TEA_menu_discard">Non salvare</string>
-	<string name="TEA_menu_comments">Commenti</string>
 	<string name="TEA_tab_activity">Attività</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
@@ -502,7 +500,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 	<string name="TEA_tags_deleted">Lista %1$s è stata cancellata, interressate %2$d attività</string>
 	<string name="TEA_tags_renamed">Rinominato %1$s in %2$s per le attivitá %3$d</string>
 	<string name="tag_settings_title">Settings:</string>
-	<string name="tag_updates_title">Attività: %s</string>
 	<string name="TPl_notification">Timer attivi per %s!</string>
 	<string name="TFE_workingOn">Attività cronometrate</string>
 	<string name="TEA_timer_comment_started">inizio attività</string>
diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml
index 9f98b02a7..e88c16d4c 100644
--- a/astrid/src/main/res/values-iw/strings.xml
+++ b/astrid/src/main/res/values-iw/strings.xml
@@ -78,7 +78,6 @@
 		<item>עדיפות בינונית</item>
 		<item>עדיפות נמוכה</item>
 	</string-array>
-	<string name="TLA_all_activity">כל הפעילות</string>
 	<string name="TAd_hiddenFormat">%s [מוסתרת]</string>
 	<string name="TAd_deletedFormat">%s [נמחקה]</string>
 	<string name="TAd_completed">הסתיימה\n%s</string>
@@ -122,8 +121,6 @@
 	<string name="TEA_elapsedDuration_label">זמן שכבר הושקע במשימה</string>
 	<string name="TEA_menu_save">שמירת השינויים</string>
 	<string name="TEA_menu_discard">לא לשמור</string>
-	<string name="TEA_menu_refresh_comments">רַעְנֵן הערות</string>
-	<string name="TEA_menu_comments">הערות</string>
 	<string name="TEA_tab_activity">פעילות</string>
 	<string name="TEA_timer_elap">זמן שעבר %s</string>
 	<string-array name="TEA_urgency">
@@ -621,7 +618,6 @@
 	<string name="TEA_tags_deleted">\"הרשימה %1$s נמחקה,  %2$d משימות השתנו\"</string>
 	<string name="TEA_tags_renamed">\"החלפתי את  %1$s ב %2$s עבור %3$d משימות\"</string>
 	<string name="tag_settings_title">הגדרות רשימה:</string>
-	<string name="tag_updates_title">פעילות: %s</string>
 	<string name="TPl_notification">קוצב זמן הופעל עבור %s משימות</string>
 	<string name="TFE_workingOn">משימות עם הערכת זמן</string>
 	<string name="TEA_timer_controls">טיימר</string>
diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml
index e6ccba4d4..3532feb43 100644
--- a/astrid/src/main/res/values-ja/strings.xml
+++ b/astrid/src/main/res/values-ja/strings.xml
@@ -97,7 +97,6 @@
 	<string name="TEA_elapsedDuration_label">既にタスクに費やした時間</string>
 	<string name="TEA_menu_save">変更の保存</string>
 	<string name="TEA_menu_discard">保存しない</string>
-	<string name="TEA_menu_comments">コメント</string>
 	<string name="TEA_tab_activity">活動</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml
index b4b06058e..a84cc70f2 100644
--- a/astrid/src/main/res/values-ko/strings.xml
+++ b/astrid/src/main/res/values-ko/strings.xml
@@ -81,7 +81,6 @@
 		<item>보통 순위</item>
 		<item>낮은 순위</item>
 	</string-array>
-	<string name="TLA_all_activity">모든 활동내역</string>
 	<string name="TAd_hiddenFormat">%s [숨김]</string>
 	<string name="TAd_deletedFormat">%s [지움]</string>
 	<string name="TAd_completed">일정 완료\n%s</string>
@@ -125,8 +124,6 @@
 	<string name="TEA_elapsedDuration_label">일정에 이미 소모한 시간</string>
 	<string name="TEA_menu_save">변경사항 저장</string>
 	<string name="TEA_menu_discard">저장하지 않음</string>
-	<string name="TEA_menu_refresh_comments">댓글 새로고침</string>
-	<string name="TEA_menu_comments">댓글</string>
 	<string name="TEA_tab_activity">활동 내역</string>
 	<string name="TEA_timer_est">동부표준시 %s</string>
 	<string name="TEA_timer_elap">경과 시간: %s</string>
@@ -630,7 +627,6 @@
 	<string name="TEA_tags_deleted">삭제한 목록 %1$s 은 %2$d 일정에 영향을 미칩니다</string>
 	<string name="TEA_tags_renamed">%3$d 일정의 %1$s 의 이름을 %2$s 로 변경했습니다</string>
 	<string name="tag_settings_title">목록 설정</string>
-	<string name="tag_updates_title">활동내역: %s</string>
 	<string name="TPl_notification">%s 동안 타이머 작동함!</string>
 	<string name="TFE_workingOn">기한이 정해진 일정</string>
 	<string name="TEA_timer_controls">타이머</string>
diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml
index b64dd37b0..a32921bf0 100644
--- a/astrid/src/main/res/values-nl/strings.xml
+++ b/astrid/src/main/res/values-nl/strings.xml
@@ -76,7 +76,6 @@
 		<item>gemiddelde prioriteit</item>
 		<item>lage prioriteit</item>
 	</string-array>
-	<string name="TLA_all_activity">Alle Activiteiten</string>
 	<string name="TAd_hiddenFormat">%s [verborgen]</string>
 	<string name="TAd_deletedFormat">%s [verwijderd]</string>
 	<string name="TAd_completed">Afgerond\n%s</string>
@@ -121,8 +120,6 @@
 	<string name="TEA_elapsedDuration_label">Bestede tijd tot nu toe</string>
 	<string name="TEA_menu_save">Wijzigingen opslaan</string>
 	<string name="TEA_menu_discard">Niet opslaan</string>
-	<string name="TEA_menu_refresh_comments">Opmerkingen vernieuwen</string>
-	<string name="TEA_menu_comments">Opmerkingen</string>
 	<string name="TEA_tab_activity">Activiteit</string>
 	<string name="TEA_timer_est">Gesch. %s</string>
 	<string name="TEA_timer_elap">Verstreken %s</string>
@@ -621,7 +618,6 @@
 	<string name="TEA_tags_deleted">De lijst %1$s is verwijderd, van invloed op %2$d taken</string>
 	<string name="TEA_tags_renamed">Taak %1$s hernoemd naar %2$s voor %3$d taken</string>
 	<string name="tag_settings_title">Lijst instellingen</string>
-	<string name="tag_updates_title">Activiteit: %s</string>
 	<string name="TPl_notification">Timers ingeschakeld voor %s!</string>
 	<string name="TFE_workingOn">Taken met timer</string>
 	<string name="TEA_timer_comment_started">taak begonnen:</string>
diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml
index c83713215..084e76377 100644
--- a/astrid/src/main/res/values-pl/strings.xml
+++ b/astrid/src/main/res/values-pl/strings.xml
@@ -74,7 +74,6 @@
 		<item>średni priorytet</item>
 		<item>Niski priorytet</item>
 	</string-array>
-	<string name="TLA_all_activity">Cała aktywność</string>
 	<string name="TAd_hiddenFormat">%s [ukryte]</string>
 	<string name="TAd_deletedFormat">%s [usunięte]</string>
 	<string name="TAd_completed">Ukończono\n%s</string>
@@ -116,8 +115,6 @@
 	<string name="TEA_elapsedDuration_label">Czas dotychczas spędzony nad tym zadaniem</string>
 	<string name="TEA_menu_save">Zapisz zmiany</string>
 	<string name="TEA_menu_discard">Nie zapisuj</string>
-	<string name="TEA_menu_refresh_comments">Odśwież komentarze</string>
-	<string name="TEA_menu_comments">Komentarze</string>
 	<string name="TEA_tab_activity">Aktywność</string>
 	<string-array name="TEA_urgency">
 		<item>Brak daty</item>
@@ -610,7 +607,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 	<string name="TEA_tags_deleted">Lista %1$s została usunięta, mających wpływ na %2$d zadań</string>
 	<string name="TEA_tags_renamed">Zmiana nazwy %1$s z %2$s dla %3$d zadań</string>
 	<string name="tag_settings_title">Settings:</string>
-	<string name="tag_updates_title">Aktywności: %s</string>
 	<string name="TPl_notification">Minutnkiki aktywne przez %s!</string>
 	<string name="TFE_workingOn">Zadania zostały spracyzowane czasowo</string>
 	<string name="TEA_timer_controls">Minutnik</string>
diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml
index 03e6e29c5..1af524537 100644
--- a/astrid/src/main/res/values-pt-rBR/strings.xml
+++ b/astrid/src/main/res/values-pt-rBR/strings.xml
@@ -76,7 +76,6 @@
 		<item>prioridade média</item>
 		<item>baixa prioridade</item>
 	</string-array>
-	<string name="TLA_all_activity">Todas as atividades</string>
 	<string name="TAd_hiddenFormat">%s [oculta]</string>
 	<string name="TAd_deletedFormat">%s [excluída]</string>
 	<string name="TAd_completed">Concluída\n%s</string>
@@ -119,8 +118,6 @@
 	<string name="TEA_elapsedDuration_label">Tempo já gasto na tarefa</string>
 	<string name="TEA_menu_save">Salvar alterações</string>
 	<string name="TEA_menu_discard">Não salvar</string>
-	<string name="TEA_menu_refresh_comments">Atualizar comentários</string>
-	<string name="TEA_menu_comments">Comentários</string>
 	<string name="TEA_tab_activity">Atividades</string>
 	<string name="TEA_timer_elap">Decorrido %s</string>
 	<string-array name="TEA_urgency">
@@ -529,7 +526,6 @@
 	<string name="TEA_tags_deleted">A Lista %1$s foi excluída, afetando %2$d tarefas</string>
 	<string name="TEA_tags_renamed">A lista %1$s foi renomeada para %2$s com %3$d tarefas</string>
 	<string name="tag_settings_title">Lista de Configurações</string>
-	<string name="tag_updates_title">Atividade: %s</string>
 	<string name="TPl_notification">Temporizador ativado para %s!</string>
 	<string name="TFE_workingOn">Tarefas com contagem de tempo</string>
 	<string name="TEA_timer_comment_started">iniciou a tarefa</string>
diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml
index 93d4c36f2..0dd4d40d5 100644
--- a/astrid/src/main/res/values-ru/strings.xml
+++ b/astrid/src/main/res/values-ru/strings.xml
@@ -78,7 +78,6 @@
 		<item>средний приоритет</item>
 		<item>низкий приоритет</item>
 	</string-array>
-	<string name="TLA_all_activity">Вся активность</string>
 	<string name="TAd_hiddenFormat">%s [скрыта]</string>
 	<string name="TAd_deletedFormat">%s [удалена]</string>
 	<string name="TAd_completed">Завершена\n%s</string>
@@ -120,8 +119,6 @@
 	<string name="TEA_elapsedDuration_label">Время уже потраченное на задачу</string>
 	<string name="TEA_menu_save">Сохранить изменения</string>
 	<string name="TEA_menu_discard">Не сохранять</string>
-	<string name="TEA_menu_refresh_comments">Обновить комментарии</string>
-	<string name="TEA_menu_comments">Комментарии</string>
 	<string name="TEA_tab_activity">Действия</string>
 	<string-array name="TEA_urgency">
 		<item>Без даты</item>
@@ -612,7 +609,6 @@
 	<string name="TEA_tags_deleted">Список %1$s был удален, затронуло %2$d задач</string>
 	<string name="TEA_tags_renamed">Переименовано %1$s в %2$s для %3$d задач</string>
 	<string name="tag_settings_title">Настройки</string>
-	<string name="tag_updates_title">Активность: %s</string>
 	<string name="TPl_notification">Для %s действуют таймеры!</string>
 	<string name="TFE_workingOn">Задачи для замера времени</string>
 	<string name="TEA_timer_controls">Таймер</string>
diff --git a/astrid/src/main/res/values-sl-rSI/strings.xml b/astrid/src/main/res/values-sl-rSI/strings.xml
index 171546a25..d90cbb464 100644
--- a/astrid/src/main/res/values-sl-rSI/strings.xml
+++ b/astrid/src/main/res/values-sl-rSI/strings.xml
@@ -80,7 +80,6 @@
 		<item>srednja prioriteta</item>
 		<item>nizka prioriteta</item>
 	</string-array>
-	<string name="TLA_all_activity">Vse dejavnosti</string>
 	<string name="TAd_hiddenFormat">%s [skrit]</string>
 	<string name="TAd_deletedFormat">%s [zbrisan]</string>
 	<string name="TAd_completed">Opravljen\n%s</string>
@@ -125,8 +124,6 @@
 	<string name="TEA_elapsedDuration_label">Porabljen čas</string>
 	<string name="TEA_menu_save">Shrani spremembe</string>
 	<string name="TEA_menu_discard">Ne shrani</string>
-	<string name="TEA_menu_refresh_comments">Osveži opombe</string>
-	<string name="TEA_menu_comments">Opombe</string>
 	<string name="TEA_tab_activity">Dejavnost</string>
 	<string name="TEA_timer_est">Cca. %s</string>
 	<string name="TEA_timer_elap">%s je potekel</string>
@@ -626,7 +623,6 @@
 	<string name="TEA_tags_deleted">Seznam %1$s je bil zbrisan, kar je vplivalo na naslednje število opravkov %2$d </string>
 	<string name="TEA_tags_renamed">Preimenoval %1$s v %2$s za%3$d opravkov</string>
 	<string name="tag_settings_title">Nastavitve seznamov</string>
-	<string name="tag_updates_title">Dejavnost: %s</string>
 	<string name="TPl_notification">Merilniki časa aktivni za %s!</string>
 	<string name="TFE_workingOn">Opravki katerim se meri čas</string>
 	<string name="TEA_timer_controls">Merilnik časa</string>
diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml
index b9f4d5a41..c757ddc3c 100644
--- a/astrid/src/main/res/values-sv/strings.xml
+++ b/astrid/src/main/res/values-sv/strings.xml
@@ -73,7 +73,6 @@
 		<item>medelhög prioritet</item>
 		<item>låg prioritet</item>
 	</string-array>
-	<string name="TLA_all_activity">Alla händelser</string>
 	<string name="TAd_hiddenFormat">%s [dold]</string>
 	<string name="TAd_deletedFormat">%s [raderad]</string>
 	<string name="TAd_completed">Avslutad\n%s</string>
@@ -113,8 +112,6 @@
 	<string name="TEA_elapsedDuration_label">Tid redan spenderad på uppgiften</string>
 	<string name="TEA_menu_save">Spara ändringar</string>
 	<string name="TEA_menu_discard">Spara inte</string>
-	<string name="TEA_menu_refresh_comments">Uppdatera kommentarer</string>
-	<string name="TEA_menu_comments">Kommentarer</string>
 	<string name="TEA_tab_activity">Aktivitet</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
@@ -565,7 +562,6 @@ och återställer dina aktuella uppgifter från en backup
 	<string name="TEA_tags_deleted">Listan %1$s raderad. Det påverkar %2$d uppgifter</string>
 	<string name="TEA_tags_renamed">Bytte namn på %1$s till %2$s för %3$d uppgifter</string>
 	<string name="tag_settings_title">Settings:</string>
-	<string name="tag_updates_title">Aktivitet: %s</string>
 	<string name="TPl_notification">Tidtagarur aktivt för %s!</string>
 	<string name="TFE_workingOn">Uppgifter med tidtagning</string>
 	<string name="TEA_timer_comment_started">påbörjade uppgiften:</string>
diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml
index c50f524da..912619d0c 100644
--- a/astrid/src/main/res/values-tr/strings.xml
+++ b/astrid/src/main/res/values-tr/strings.xml
@@ -74,7 +74,6 @@
 		<item>orta öncelik</item>
 		<item>düşük öncelik</item>
 	</string-array>
-	<string name="TLA_all_activity">Tüm Etkinlik</string>
 	<string name="TAd_hiddenFormat">%s [gizli]</string>
 	<string name="TAd_deletedFormat">%s [silinmiş]</string>
 	<string name="TAd_completed">Bitti\n%s</string>
@@ -109,7 +108,6 @@
 	<string name="TEA_elapsedDuration_label">Görev üzerinde çalışılan zaman</string>
 	<string name="TEA_menu_save">Değişiklikleri Kaydet</string>
 	<string name="TEA_menu_discard">Kaydetme</string>
-	<string name="TEA_menu_comments">Yorumlar</string>
 	<string name="TEA_tab_activity">Etkinlik</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
@@ -556,7 +554,6 @@
 	<string name="TEA_tags_deleted">%1$s listesi, %2$d görevlerini etkileyecek şekilde silindi</string>
 	<string name="TEA_tags_renamed">%1$s yeniden %3$d görevleri için %2$s olarak isimlendirildi.</string>
 	<string name="tag_settings_title">Liste Ayarları:</string>
-	<string name="tag_updates_title">Etkinlik: %s</string>
 	<string name="TPl_notification">%s için kronometre etkin!</string>
 	<string name="TFE_workingOn">Zaman Ölçümü Olan Görevler</string>
 	<string name="TEA_timer_comment_started">başlanan görev:</string>
diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml
index 59d3d1b1f..b58fbd81b 100644
--- a/astrid/src/main/res/values-uk/strings.xml
+++ b/astrid/src/main/res/values-uk/strings.xml
@@ -81,7 +81,6 @@
 		<item>середній пріоритет</item>
 		<item>низький пріоритет</item>
 	</string-array>
-	<string name="TLA_all_activity">Вся діяльність</string>
 	<string name="TAd_hiddenFormat">%s [приховано]</string>
 	<string name="TAd_deletedFormat">%s [видалено]</string>
 	<string name="TAd_completed">Завершено\n%s</string>
@@ -125,8 +124,6 @@
 	<string name="TEA_elapsedDuration_label">Час вже потрачео</string>
 	<string name="TEA_menu_save">Зберегти зміни</string>
 	<string name="TEA_menu_discard">Не зберігати зміни</string>
-	<string name="TEA_menu_refresh_comments">Оновити коментарі</string>
-	<string name="TEA_menu_comments">Коментарі</string>
 	<string name="TEA_tab_activity">Активність</string>
 	<string name="TEA_timer_est">Зал. %s</string>
 	<string name="TEA_timer_elap">Час, що минув %s</string>
diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml
index 4ad7d3371..624d09f6f 100644
--- a/astrid/src/main/res/values-zh-rCN/strings.xml
+++ b/astrid/src/main/res/values-zh-rCN/strings.xml
@@ -77,7 +77,6 @@
 		<item>中等优先级</item>
 		<item>低优先级</item>
 	</string-array>
-	<string name="TLA_all_activity">所有活动</string>
 	<string name="TAd_hiddenFormat">%s [已隐藏]</string>
 	<string name="TAd_deletedFormat">%s [已删除]</string>
 	<string name="TAd_completed">完成\n%s 项</string>
@@ -112,7 +111,6 @@
 	<string name="TEA_elapsedDuration_label">已用于任务的时间</string>
 	<string name="TEA_menu_save">保存更改</string>
 	<string name="TEA_menu_discard">不保存</string>
-	<string name="TEA_menu_comments">注释</string>
 	<string name="TEA_tab_activity">活动</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
@@ -543,7 +541,6 @@
 	<string name="TEA_tags_deleted">列表 %1$s 已删除，影响了 %2$d 项任务</string>
 	<string name="TEA_tags_renamed">%3$d 项任务由 %1$s 重命名为 %2$s。</string>
 	<string name="tag_settings_title">设置：</string>
-	<string name="tag_updates_title">活跃程度：%s</string>
 	<string name="TPl_notification">秒表启动了 %s！</string>
 	<string name="TFE_workingOn">任务已开始计时</string>
 	<string name="TEA_timer_comment_started">已经开始了这项任务：</string>
diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml
index b02c5e77e..33f15ab84 100644
--- a/astrid/src/main/res/values-zh-rTW/strings.xml
+++ b/astrid/src/main/res/values-zh-rTW/strings.xml
@@ -77,7 +77,6 @@
 		<item>普通</item>
 		<item>低優先權</item>
 	</string-array>
-	<string name="TLA_all_activity">所有活動</string>
 	<string name="TAd_hiddenFormat">%s [隱藏]</string>
 	<string name="TAd_deletedFormat">%s [刪除]</string>
 	<string name="TAd_completed">%s\n完成</string>
@@ -112,7 +111,6 @@
 	<string name="TEA_elapsedDuration_label">已經用掉的時間</string>
 	<string name="TEA_menu_save">儲存變更</string>
 	<string name="TEA_menu_discard">不要儲存</string>
-	<string name="TEA_menu_comments">註釋</string>
 	<string name="TEA_tab_activity">活動</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
@@ -565,7 +563,6 @@
 	<string name="TEA_tags_deleted">列表%1$s 已刪除，影響了%2$d 項任務工作</string>
 	<string name="TEA_tags_renamed">%3$d 項任務工作由%1$s 重命名為%2$s。</string>
 	<string name="tag_settings_title">設置：</string>
-	<string name="tag_updates_title">活躍程度：%s</string>
 	<string name="TPl_notification">秒錶啟動了 %s！</string>
 	<string name="TFE_workingOn">任務工作已開始計時</string>
 	<string name="TEA_timer_comment_started">已經開始了這項任務工作：</string>
diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml
index 14a368460..e2a01e2d3 100644
--- a/astrid/src/main/res/values/strings-core.xml
+++ b/astrid/src/main/res/values/strings-core.xml
@@ -107,9 +107,6 @@
       <item>low priority</item>
   </string-array>
 
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">All Activity</string>
-
   <!-- ====================================================== TaskAdapter == -->
   
   <!-- Format string to indicate task is hidden (%s => task name) -->
@@ -250,11 +247,6 @@
   <!-- Menu: Don't Save -->
   <string name="TEA_menu_discard">Don\'t Save</string>
   
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">Comments</string>
-  
   <!-- slide 15b: Task edit tab: activity -->
   <string name="TEA_tab_activity">Activity</string>
   
diff --git a/astrid/src/main/res/values/strings-tags.xml b/astrid/src/main/res/values/strings-tags.xml
index 08015bd13..6e4762226 100644
--- a/astrid/src/main/res/values/strings-tags.xml
+++ b/astrid/src/main/res/values/strings-tags.xml
@@ -52,7 +52,4 @@
   <!-- Header for tag settings -->
   <string name="tag_settings_title">List Settings</string>
   
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Activity: %s</string>
-
 </resources>