diff --git a/astrid/.classpath b/astrid/.classpath
index 22b200ef1..4c3509217 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -27,9 +27,9 @@
 	<classpathentry exported="true" kind="lib" path="libs/google-oauth-client-1.6.0-beta.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/google-oauth-client-extensions-1.6.0-beta.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/gson-1.7.1.jar"/>
-	<classpathentry kind="lib" path="libs/crittercism_v2_1_2.jar"/>
 	<classpathentry kind="lib" path="libs/findbugs-annotations.jar"/>
 	<classpathentry kind="lib" path="libs/CWAC-SackOfViewsAdapter.jar"/>
 	<classpathentry kind="lib" path="libs/gcm.jar" sourcepath="libs/gcm-src.jar"/>
+	<classpathentry kind="lib" path="libs/crittercism_v3_0_7_sdkonly.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index bc878327e..2de00d60b 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -188,11 +188,6 @@
         android:theme="@android:style/Theme" />
     
     <!-- Start of Crittercism.com Code -->
-	<activity android:name="com.crittercism.NewFeedbackSpringboardActivity" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"></activity>
-	<activity android:name="com.crittercism.NewFeedbackIssueListActivity" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"></activity>
-	<activity android:name="com.crittercism.NewFeedbackQuestionListActivity" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"></activity>
-	<activity android:name="com.crittercism.NewFeedbackItemDetailsActivity" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"></activity>
-	<activity android:name="com.crittercism.NewFeedbackCreateActivity" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"></activity>
     <activity android:name="com.crittercism.NotificationActivity"/>
 
     <service android:name="com.crittercism.service.CrittercismService"
diff --git a/astrid/libs/crittercism_v2_1_2.jar b/astrid/libs/crittercism_v2_1_2.jar
deleted file mode 100644
index cdc546a71..000000000
Binary files a/astrid/libs/crittercism_v2_1_2.jar and /dev/null differ
diff --git a/astrid/libs/crittercism_v3_0_7_sdkonly.jar b/astrid/libs/crittercism_v3_0_7_sdkonly.jar
new file mode 100644
index 000000000..e5d4c0831
Binary files /dev/null and b/astrid/libs/crittercism_v3_0_7_sdkonly.jar differ
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
index 46049b40a..bf42dfd77 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
@@ -20,6 +20,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ProgressBar;
 
+import com.crittercism.app.Crittercism;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
@@ -366,6 +367,7 @@ public class ActFmSyncThread {
         } catch (Exception e) {
             // In the worst case, restart thread if something goes wrong
             Log.e(ERROR_TAG, "Unexpected sync thread exception", e);
+            Crittercism.logHandledException(e);
             thread = null;
             startSyncThread();
         }
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index ab879de0e..42d293061 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -147,8 +147,6 @@ public class StartupService {
 
         if(!StatisticsService.dontCollectStatistics()) {
             Crittercism.init(context.getApplicationContext(), Constants.CRITTERCISM_APP_ID);
-            Crittercism.setShouldUseAmazonMarket(Constants.MARKET_STRATEGY.getClass() ==
-                MarketStrategy.AmazonMarketStrategy.class);
         }
 
         try {