diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 642b9513e..b366fb295 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -373,7 +373,6 @@
     <!-- actfm -->
     <activity android:name="com.todoroo.astrid.actfm.ActFmLoginActivity"
               android:configChanges="keyboardHidden"/>
-    <activity android:name="com.todoroo.astrid.taskrabbit.TaskRabbitOAuthLoginActivity" />
     <activity android:name="com.facebook.LoginActivity" />
     <activity android:name="com.todoroo.astrid.actfm.ActFmPreferences"
               android:theme="@android:style/Theme"
diff --git a/astrid/build.xml b/astrid/build.xml
index 02e266c30..a8266c43c 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -124,20 +124,6 @@
                      match="APP_SECRET = .*"
                      replace="APP_SECRET = &quot;${apikey.actfm.secret}&quot;;" />
 
-      <replaceregexp file="${source.dir}/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java"
-                     match="TASK_RABBIT_CLIENT_ID = .*"
-                     replace="TASK_RABBIT_CLIENT_ID = &quot;${apikey.taskrabbit.clientid}&quot;;" />
-      <replaceregexp file="${source.dir}/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java"
-                     match="TASK_RABBIT_CLIENT_APPLICATION_ID = .*"
-                     replace="TASK_RABBIT_CLIENT_APPLICATION_ID = &quot;${apikey.taskrabbit.appid}&quot;;" />
-      <replaceregexp file="${source.dir}/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java"
-                     match="TASK_RABBIT_URL = .*"
-                     replace="TASK_RABBIT_URL = &quot;${apikey.taskrabbit.url}&quot;;" />
-
-      <replaceregexp file="${source.dir}/com/todoroo/astrid/taskrabbit/TaskRabbitMapActivity.java"
-    	             match="MAPS_API_KEY = .*"
-    	             replace="MAPS_API_KEY = &quot;${apikey.maps}&quot;;" />
-
       <replaceregexp file="${source.dir}/com/todoroo/astrid/gtasks/api/GtasksInvoker.java"
                      match="API_KEY = .*"
                      replace="API_KEY = &quot;${apikey.gtasks}&quot;;" />
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index c969e0912..4b7f679a7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -8,8 +8,6 @@ package com.todoroo.astrid.actfm;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -120,15 +118,7 @@ public class EditPeopleControlSet extends PopupControlSet {
 
     private final Resources resources;
 
-    private final List<AssignedChangedListener> listeners = new LinkedList<AssignedChangedListener>();
-
-    public interface AssignedChangedListener {
-        public boolean showTaskRabbitForUser(String name, JSONObject json);
-        public boolean shouldShowTaskRabbit();
-        public boolean didPostToTaskRabbit();
-    }
-
-    private int selected = 0; //need to remember last selected state for task rabbit
+    private int selected = 0; // remember last selected state
 
     static {
         AstridDependencyInjector.initialize();
@@ -528,16 +518,6 @@ public class EditPeopleControlSet extends PopupControlSet {
                     long id) {
                 AssignedToUser user = (AssignedToUser) assignedList.getAdapter().getItem(position);
 
-                for (AssignedChangedListener l : listeners) {
-                    if(l.showTaskRabbitForUser(user.label, user.user)) {
-                        assignedDisplay.setText(user.toString());
-                        assignedCustom.setText(""); //$NON-NLS-1$
-                        DialogUtilities.dismissDialog(activity, dialog);
-                        return;
-                    }
-
-                }
-
                 if (user.user.has(CONTACT_CHOOSER_USER)) {
                     Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.Contacts.CONTENT_URI);
                     fragment.startActivityForResult(intent, TaskEditFragment.REQUEST_CODE_CONTACT);
@@ -638,7 +618,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                     return true;
                 AssignedToUser item = (AssignedToUser) assignedList.getAdapter().getItem(assignedList.getCheckedItemPosition());
                 if (item != null) {
-                    if (item.equals(contactPickerUser)) { //don't want to ever set the user as the task rabbit user
+                    if (item.equals(contactPickerUser)) { //don't want to ever set the user as the fake contact picker user
                         return true;
                     }
                     userJson = item.user;
@@ -854,13 +834,4 @@ public class EditPeopleControlSet extends PopupControlSet {
             .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
                     | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
     }
-
-    public void addListener(AssignedChangedListener listener) {
-        listeners.add(listener);
-    }
-
-    public void removeListener(AssignedChangedListener listener) {
-        if (listeners.contains(listener))
-            listeners.remove(listener);
-    }
 }
diff --git a/astrid/res/layout/task_rabbit_enter.xml b/astrid/res/layout/task_rabbit_enter.xml
deleted file mode 100644
index 115e87ae2..000000000
--- a/astrid/res/layout/task_rabbit_enter.xml
+++ /dev/null
@@ -1,88 +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. 
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    style="@style/Content_EditScroll"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_weight="100"
-    android:orientation="vertical" >
-
-    <ScrollView
-        android:id="@+id/edit_scroll"
-        style="@style/Content_EditScroll"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100" >
-
-        <LinearLayout
-            android:id="@+id/task_rabbit_parent"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="#00000000"
-            android:orientation="vertical"
-            android:padding="10dip" >
-
-            <Spinner
-                android:id="@+id/task_type"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:id="@+id/title_controls"
-                style="@style/EditRow"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical" >
-
-                <com.todoroo.astrid.ui.ErrorCatchingEditText
-                    android:id="@+id/task_title"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="100"
-                    android:autoText="true"
-                    android:background="@drawable/edit_title_background"
-                    android:capitalize="sentences"
-                    android:freezesText="true"
-                    android:hint="@string/TEA_title_hint"
-                    android:inputType="textMultiLine"
-                    android:paddingLeft="5dip"
-                    android:paddingTop="3dip"
-                    android:scrollbars="vertical"
-                    android:text=""
-                    android:textColor="@android:color/black" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/task_controls"
-                style="@style/EditRow"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dip"
-                android:orientation="vertical" />
-
-            <LinearLayout
-                android:id="@+id/description_controls"
-                style="@style/EditRow"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dip"
-                android:orientation="vertical" >
-
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-    <Button
-        android:id="@+id/task_button"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dip"
-        android:text="Post Task!" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_rabbit_header_view.xml b/astrid/res/layout/task_rabbit_header_view.xml
deleted file mode 100644
index 7d68d11ac..000000000
--- a/astrid/res/layout/task_rabbit_header_view.xml
+++ /dev/null
@@ -1,43 +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. 
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal" >
-    
-        <RelativeLayout
-            android:id="@+id/menu_nav"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_margin="5dip"
-            android:gravity="center_vertical"
-            android:paddingLeft="5dip"
-            android:paddingRight="5dip" >
-
-            <TextView
-                android:id="@+id/task_rabbit_title"
-                style="@style/TextAppearance.ActionBar_ListsHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                android:text="@string/BFE_Active" />
-
-            <ImageView
-                android:id="@+id/menu_disclosure_arrow"
-                android:layout_width="12dip"
-                android:layout_height="12dip"
-                android:layout_alignBottom="@id/task_rabbit_title"
-                android:layout_marginLeft="10dip"
-                android:layout_toRightOf="@id/task_rabbit_title"
-                android:scaleType="fitCenter"
-                android:src="?attr/asListsDisclosure" />
-        </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_rabbit_map_activity.xml b/astrid/res/layout/task_rabbit_map_activity.xml
deleted file mode 100644
index 4a303785e..000000000
--- a/astrid/res/layout/task_rabbit_map_activity.xml
+++ /dev/null
@@ -1,36 +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. 
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/task_rabbit_map_parent"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    style="@style/Content_EditScroll" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:minHeight="50dip" >
-
-        <EditText
-            android:id="@+id/search_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="10"
-            android:minHeight="50dip"
-            android:hint="Enter address"/>
-
-        <ImageButton
-            android:id="@+id/search_button"
-            android:layout_width="50dip"
-            android:layout_height="50dip"
-            android:layout_weight="1"
-            android:scaleType="center" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/astrid/res/layout/task_rabbit_menu_popover.xml b/astrid/res/layout/task_rabbit_menu_popover.xml
deleted file mode 100644
index 2e8471b38..000000000
--- a/astrid/res/layout/task_rabbit_menu_popover.xml
+++ /dev/null
@@ -1,37 +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. 
--->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip">
-
-    <FrameLayout
-        android:id="@+id/content"
-        android:layout_width="280dip"
-        android:layout_height="wrap_content"
-    android:background="?attr/asListPopoverBg"
-        android:layout_below="@+id/gdi_arrow_up"/>
-
-    <ImageView
-        android:id="@+id/gdi_arrow_up"
-        android:layout_width="27dip"
-        android:layout_height="27dip"
-        android:scaleType="fitCenter"
-        android:layout_marginBottom="-8dip"
-        android:src="@drawable/list_arrow_up" />
-
-    <ImageView
-        android:id="@+id/gdi_arrow_down"
-        android:layout_width="27dip"
-        android:layout_height="27dip"
-        android:scaleType="fitCenter"
-        android:layout_marginBottom="-8dip"
-        android:layout_below="@android:id/list"
-        android:src="@drawable/list_arrow_down" />
-
-</RelativeLayout>
diff --git a/astrid/res/layout/task_rabbit_menu_row.xml b/astrid/res/layout/task_rabbit_menu_row.xml
deleted file mode 100644
index efbcc926c..000000000
--- a/astrid/res/layout/task_rabbit_menu_row.xml
+++ /dev/null
@@ -1,19 +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. 
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TextAppearance.FLA_Filter"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="left|center_vertical"
-    android:padding="10dp"
-    android:paddingBottom="5dip"
-    android:paddingRight="6dip"
-    android:paddingTop="5dip"
-    
-    android:textSize="16sp" >
-
-</TextView>
\ No newline at end of file
diff --git a/astrid/res/layout/task_rabbit_row.xml b/astrid/res/layout/task_rabbit_row.xml
deleted file mode 100644
index c47debe26..000000000
--- a/astrid/res/layout/task_rabbit_row.xml
+++ /dev/null
@@ -1,46 +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. 
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/display_row_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="50dip"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip" >
-
-        <TextView
-            android:id="@+id/display_row_title"
-            style="@style/TextAppearance.GEN_EditLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="15dip" />
-
-        <TextView
-            android:id="@+id/display_row_edit"
-            style="@style/TextAppearance.EditRowDisplay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:maxLines="2"
-            android:paddingLeft="5dip" />
-    </LinearLayout>
-
-    <View
-        android:id="@+id/TEA_Separator"
-        style="@style/TEA_Separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px" />
-
-</LinearLayout>
diff --git a/astrid/res/layout/task_rabbit_row_description.xml b/astrid/res/layout/task_rabbit_row_description.xml
deleted file mode 100644
index 0e6bcd8e3..000000000
--- a/astrid/res/layout/task_rabbit_row_description.xml
+++ /dev/null
@@ -1,65 +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. 
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-        android:id="@+id/display_row_body"
-        android:minHeight="50dip"
-        android:padding="10dip"  >
-
-            <TextView
-                android:id="@+id/display_row_title"
-                style="@style/TextAppearance.GEN_EditLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-    
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:minHeight="50dip"
-        android:orientation="horizontal"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip" >
-
-            <ImageButton
-                android:id="@+id/picture"
-                android:layout_width="40dip"
-                android:layout_height="40dip"
-                android:background="#00000000"
-                android:scaleType="centerInside"
-                android:layout_marginRight="10dip"
-                android:src="@drawable/camera_button" />
-            <!-- Voice Add Note Button -->
-
-            <ImageButton
-                android:id="@+id/voiceAddNoteButton"
-                android:layout_width="40dip"
-                android:layout_height="40dip"
-                android:background="#00000000"
-                android:layout_marginRight="10dip"
-                android:scaleType="centerInside"
-                android:src="@android:drawable/ic_btn_speak_now"
-                android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/display_row_edit"
-            style="@style/TextAppearance.EditRowDisplay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="top"
-            android:gravity="left"
-            android:text="Enter description..."
-            android:paddingLeft="5dip"
-            android:layout_marginTop="10dip"
-            android:layout_marginBottom="10dip" />
-    </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_rabbit_spinner.xml b/astrid/res/layout/task_rabbit_spinner.xml
deleted file mode 100644
index 9273e0a92..000000000
--- a/astrid/res/layout/task_rabbit_spinner.xml
+++ /dev/null
@@ -1,51 +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. 
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/display_row_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="50dip"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="10dip"
-        android:paddingRight="5dip" >
-        
-  <Spinner
-    android:id="@+id/spinner"
-    android:layout_width="0dip"
-    android:layout_height="0dip" />
-
-        <TextView
-            android:id="@+id/display_row_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/TextAppearance.GEN_EditLabel" />
-
-        
-        <TextView
-            android:id="@+id/display_row_edit"
-            style="@style/TextAppearance.EditRowDisplay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:maxLines="2"
-            android:paddingLeft="5dip" />
-    </LinearLayout>
-
-    <View
-        android:id="@+id/TEA_Separator"
-        style="@style/TEA_Separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index e6b757b78..8a423ace8 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -39,7 +39,6 @@
   <string name="actfm_EPA_assign_me">Jo</string>
   <string name="actfm_EPA_unassigned">Sense assignar</string>
   <string name="actfm_EPA_choose_contact">Escolliu un contacte</string>
-  <string name="actfm_EPA_task_rabbit">Subcontracta\'l!</string>
   <string name="actfm_EPA_share_with">Comparteix-la amb:</string>
   <string name="actfm_EPA_collaborators_header">Comparteix-la amb els amics</string>
   <string name="actfm_EPA_list">Llista: %s</string>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index c09042114..77d79beb6 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -456,7 +456,6 @@
   <string name="welcome_login_confirm_later_ok">Jasně!</string>
   <string name="welcome_login_confirm_later_cancel">Ne, díky</string>
   <string name="welcome_login_confirm_later_dialog">Přihlašte se a získejte z Astrid více! Zdarma získáte online zálohování, plnou synchronizaci s Astrid.com, možnost přidávat úkoly emailem a dokonce můžete sdílet seznamy úkolů s přáteli!</string>
-  <string name="help_popover_taskrabbit_type">Změnit druh úkolu</string>
   <string name="locale_edit_alerts_title">Astrid Upozornění filtrů</string>
   <string name="locale_edit_intro">Astrid Ti pošle upozornění, když budeš mít úkoly v následujícím filtru:</string>
   <string name="locale_interval_label">Omezit upozornění na:</string>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 0216bf183..fdfa02bfb 100755
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Wählen Sie einen Kontakt aus</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Jemandem zuweisen!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1860,9 +1857,6 @@
   
   <string name="welcome_login_confirm_later_dialog">"Melde dich an, um alles aus Astrid rauszuholen! Gratis, du kannst mit Astrid.com synchronisieren, Aufgaben per email hinzufügen  und du kannst sogar Aufgaben mit Freunden teilen!"</string>
   
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Aufgabentyp ändern</string>
 
 
 <!-- 
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 067e2ca92..8b3810083 100755
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Elegir un contacto</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">¡Encargarlo fuera!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1870,9 +1867,6 @@ Ten en cuenta que sincronizarse con ambos servicios puede, en algún caso, lleva
 Es gratis, obtienes copias de seguridad en línea, sincronización completa con Astrid.com,
 podrás agregar tareas vía correo electrónico, e incluso compartir listas de tareas con tus amigos!</string>
   
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Cambiar el tipo de tarea</string>
 
 
 <!-- 
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 4b303f82c..66bc457f1 100755
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Choisissez un contact</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Sous-traitez le !</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1859,9 +1856,6 @@
   
   <string name="welcome_login_confirm_later_dialog">"Connectez-vous pour tirer le maximum d\'Astrid!  Cela comprend la sauvegarde en ligne, la syncronisation complète avec le serveur Astrid.com, la possibilité d\'ajout de taches par courriel, et même de partager des listes de taches avec ses amis et tout cela gratuitement!"</string>
   
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Changer le type de tache</string>
 
 
 <!-- 
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 370391385..efb236192 100755
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Scegli un contatto</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Delega!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1869,9 +1866,6 @@ Sei sicuro di volerti sincronizzare con Google Tasks?</string>
 Gratuitamente, hai il backup online, la sincronizzazione completa con Astrid.com, la
 possibilità di aggiungere attività via email, e puoi anche condividere elenchi di attività con gli amici!</string>
   
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Cambia il tipo di task</string>
 
 
 <!-- 
diff --git a/astrid/res/values-iw/strings.xml b/astrid/res/values-iw/strings.xml
index e01899eae..63a708d50 100644
--- a/astrid/res/values-iw/strings.xml
+++ b/astrid/res/values-iw/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">בחר איש קשר</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">העבר למיקור חוץ!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1869,9 +1866,6 @@
   
   <string name="welcome_login_confirm_later_dialog">עליך להרשם כדי להפיק את המירב מאסטריד! תוכל לקבל גיבויים חינם, סינכרון מלא עם אתר astrid.com, אפשרות להוסיף משימות בדוא״ל, ואפילו אפשרות לשתף משימות עם חברים!</string>
   
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">שנה את סוג המשימה</string>
 
 
 <!-- 
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index 5e7962719..c051c6a1e 100755
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">連絡先を選択する</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">アウトソーシング</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1880,10 +1877,6 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="welcome_login_confirm_later_dialog">Sign in to get the most out of Astrid! 
   For free, you get online backup, full synchronization with Astrid.com, the 
   ability to add tasks via email, and you can even share task lists with friends!</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Change the type of task</string>
 
 
 <!-- 
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index 18459f43e..6609e8d0b 100755
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">연락처를 선택하세요</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">다른 사람에게 맡기기!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1858,10 +1855,6 @@
   <string name="welcome_login_confirm_later_cancel">됐거든요</string>
   
   <string name="welcome_login_confirm_later_dialog">Astrid을 잘 사용하기 위해 가입하세요! 무료로 온라인 백업, Astrid.com 에 전체 동기화, 이메일로 일정 추가하기 그리고 친구들과 일정 목록을 공유할수 있습니다!</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">일정 형식을 변경하기</string>
 
 
 <!-- 
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 7387cc2ac..bef220984 100755
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Kies een contactpersoon</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Besteed dit uit!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1858,10 +1855,6 @@
   <string name="welcome_login_confirm_later_cancel">Nee, bedankt</string>
   
   <string name="welcome_login_confirm_later_dialog">Log in om het meeste uit Astrid te halen! Je krijgt gratis online backup, synchronisatie met Astrid.com, de mogelijkheid om taken toe te voegen via e-mail en lijsten te delen met vrienden!</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Verander het type taak</string>
 
 
 <!-- 
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index 29375a85f..3009ddd04 100755
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Wybierz kontakt</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Zleć to!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1861,10 +1858,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import
   <string name="welcome_login_confirm_later_cancel">Nie, dzięki</string>
   
   <string name="welcome_login_confirm_later_dialog">Zaloguj się by wyciągnąć z Astrid jeszcze więcej! Za darmo otrzymasz kopię zapasową online, pełną synchronizację z Astrid.com, możliwość dodawania zadań przez e-mail i będziesz mógł dzielić się swoimi listami zadań ze znajomymi!</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Zmień rodzaj zadania</string>
 
 
 <!-- 
diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
index 5f1e378e8..38d0d08ab 100755
--- a/astrid/res/values-pt-rBR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Escolha um contato</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Delegue!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1858,10 +1855,6 @@
   <string name="welcome_login_confirm_later_cancel">Não, obrigado</string>
   
   <string name="welcome_login_confirm_later_dialog">Conecte-se para obter mais do Astrid! É de graça, você tem backup online, sincronização completa com Astrid.com e possibilidade de adicionar tarefas via email, podendo inclusive compartilhar com seus amigos!</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Mudar o tipo da tarefa</string>
 
 
 <!-- 
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 2f2f91c5a..d13b4525a 100755
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Выберите контакт</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Делегируй это!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1864,10 +1861,6 @@
   <string name="welcome_login_confirm_later_cancel">Спасибо, не надо</string>
   
   <string name="welcome_login_confirm_later_dialog">Войдите, чтобы получить максимум от Astrid! Бесплатно вы получите онлайн резервирование, полную синхронизацию с Astrid.com, возможность добавлять задачи по почте и даже делиться своими списками задач с друзьями!</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Изменить тип задачи</string>
 
 
 <!-- 
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index 2849bf080..b320eed99 100755
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Välj en kontakt</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Lägg ut det på någon annan!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1866,10 +1863,6 @@ Var vänlig notera att synkning av båda tjänsterna samtidigt i vissa fall kan
   <string name="welcome_login_confirm_later_cancel">Nej tack</string>
   
   <string name="welcome_login_confirm_later_dialog">Logga in för att få ut så mycket som möjligt av Astrid! Utan kostnad får du säkerhetskopia via nätet, full synkronisering med Astrid.com, möjlighet att lägga till uppgifter via e-post, och du kan till och med dela uppgiftslistor med vänner!</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Byt typ av uppgift</string>
 
 
 <!-- 
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index 52d19105f..33076b9fb 100755
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Bir kişi seç</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Dış kaynak kullan!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1862,10 +1859,6 @@
   <string name="welcome_login_confirm_later_cancel">Hayır, teşekkürler</string>
   
   <string name="welcome_login_confirm_later_dialog">Astridden mümkün olduğunca faydalanmak için giriş yapın. Ücretsiz olarak çevirimiçi yedekleme, Astrid.com ile senkronizasyon, email ile görev ekleme ve arkadaşlar ile görev listesi paylaşma özelliklerine ulaşın.</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Görev türünü değiştir</string>
 
 
 <!-- 
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 2e51e7efc..08b656f2d 100755
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">选择联系人</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">将任务外包</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1860,10 +1857,6 @@
   <string name="welcome_login_confirm_later_cancel">不了，谢谢</string>
   
   <string name="welcome_login_confirm_later_dialog">登录吧，充分利用清单小助理！无需任何费用，您就可以获得在线备份、和 Astrid.com 全面同步、可以通过电子邮件添加任务、而且您甚至可以和朋友们一起分享任务列表呢！</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">更改任务类型</string>
 
 
 <!-- 
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index e6ce80f43..a3e83d15f 100755
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">選擇聯繫人</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">將任務工作外包</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
@@ -1858,10 +1855,6 @@
   <string name="welcome_login_confirm_later_cancel">不了，謝謝</string>
   
   <string name="welcome_login_confirm_later_dialog">登錄吧，充分利用Astrid！無需任何費用，您就可以獲得在線備份、和Astrid.com 全面同步、可以通過電子郵件添加任務工作、而且您甚至可以和朋友們一起分享任務工作列表呢！</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">更改任務工作類型</string>
 
 
 <!-- 
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 68cedd19f..d15ca08fc 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -450,7 +450,6 @@
   <string name="TEA_ctrl_title_pref">TEA_ctrl_title_pref</string> <!-- Deprecated -->
   <string name="TEA_ctrl_who_pref">TEA_ctrl_who_pref</string>
   <string name="TEA_ctrl_when_pref">TEA_ctrl_when_pref</string>
-  <string name="TEA_ctrl_task_rabbit_pref">TEA_ctrl_task_rabbit_pref</string>
   <string name="TEA_ctrl_more_pref">TEA_ctrl_more_pref</string>
   <string name="TEA_ctrl_importance_pref">TEA_ctrl_importance_pref</string>
   <string name="TEA_ctrl_lists_pref">TEA_ctrl_lists_pref</string>
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 8572cd354..4700f5210 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -159,9 +159,6 @@
   <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Choose a contact</string>
   
-  <!-- slide 17a: task sharing dialog: use task rabbit -->
-  <string name="actfm_EPA_task_rabbit">Outsource it!</string>
-  
   <!-- task sharing dialog: custom email assignment -->
   
   <!-- task sharing dialog: shared with label -->
diff --git a/astrid/res/values/strings-intro.xml b/astrid/res/values/strings-intro.xml
index 0f7b0a361..4d560e8b8 100644
--- a/astrid/res/values/strings-intro.xml
+++ b/astrid/res/values/strings-intro.xml
@@ -54,8 +54,4 @@
   <string name="welcome_login_confirm_later_dialog">Sign in to get the most out of Astrid! 
   For free, you get online backup, full synchronization with Astrid.com, the 
   ability to add tasks via email, and you can even share task lists with friends!</string>
-  
-  
-  <!-- Shown after user goes to task rabbit activity-->
-  <string name="help_popover_taskrabbit_type">Change the type of task</string>
 </resources>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 8998553a1..3f47658e1 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -471,8 +471,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         // EditPeopleControlSet relies on the "tags" transitory created by the
         // TagsControlSet, so we put the tags control before the people control
-        // EditPeopleControlSet also relies on taskRabbitControl set being added
-        // that way it can tell if it needs to show task rabbit in the spinner
 
         peopleControlSet = new EditPeopleControlSet(getActivity(), this,
                 R.layout.control_set_assigned,
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index ec3ac216c..9c77bbb7e 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -1017,7 +1017,7 @@ public class TaskListFragment extends SherlockListFragment implements OnScrollLi
         if (tagName != null)
             tagsJoinCriterion = Criterion.and(tagsJoinCriterion, Field.field(TAGS_METADATA_JOIN + "." + TaskToTagMetadata.TAG_NAME.name).neq(tagName));
 
-        // TODO: For now, we'll modify the query to join and include the task rabbit and tag data here.
+        // TODO: For now, we'll modify the query to join and include the things like tag data here.
         // Eventually, we might consider restructuring things so that this query is constructed elsewhere.
         String joinedQuery =
                 Join.left(Metadata.TABLE.as(TAGS_METADATA_JOIN),
diff --git a/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java b/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java
index 1ea180a27..08a5ec599 100644
--- a/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java
+++ b/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java
@@ -68,9 +68,6 @@ public class StatisticsConstants {
     public static final String REPEAT_TASK_CREATE = "repeat-task-create";
     public static final String ACTFM_LIST_SHARED = "actfm-list-shared";
     public static final String IDEAS_LINK_CLICKED = "ideas-link-clicked";
-    public static final String TASK_RABBIT_VIEW = "task-rabbit-view";
-    public static final String TASK_RABBIT_POST = "task-rabbit-post";
-    public static final String TASK_RABBIT_LOGIN = "task-rabbit-login";
     public static final String SHARE_PAGE_VIEWED = "share-page-viewed";
     public static final String SHARE_BUTTON_CLICKED = "share-button-clicked";
     public static final String PREMIUM_PAGE_VIEWED = "premium-page-viewed";