diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 82c51b017..728bf011b 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -29,7 +29,6 @@ import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.data.TaskAttachment;
@@ -79,8 +78,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
     @Autowired
     private TaskService taskService;
-    @Autowired
-    private ActFmPreferenceService actFmPreferenceService;
 
     @Autowired
     private Database database;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 8c43ccb6d..b5967624b 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -56,7 +56,6 @@ 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.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.dao.TaskAttachmentDao;
 import com.todoroo.astrid.dao.TaskOutstandingDao;
@@ -206,9 +205,6 @@ public final class TaskEditFragment extends SherlockFragment implements
     @Autowired
     private TaskAttachmentDao taskAttachmentDao;
 
-    @Autowired
-    private ActFmPreferenceService actFmPreferenceService;
-
     @Autowired
     private UserDao userDao;
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index b026eff11..8d76f87db 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -56,7 +56,6 @@ import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.TagViewFragment;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.SortSelectionActivity.OnSortSelectedListener;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.adapter.TaskAdapter.OnCompletedTaskListener;
@@ -181,9 +180,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     @Autowired
     TaskListMetadataDao taskListMetadataDao;
 
-    @Autowired
-    ActFmPreferenceService actFmPreferenceService;
-
     private final TaskContextActionExposer[] contextItemExposers = new TaskContextActionExposer[]{
             new ReminderDebugContextActions.MakeNotification(),
             new ReminderDebugContextActions.WhenReminder(),
diff --git a/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java
index bd1797cf6..0d76af4cc 100644
--- a/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java
+++ b/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java
@@ -14,13 +14,11 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.view.View;
 import android.view.ViewGroup.OnHierarchyChangeListener;
 
-import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 
 import org.astrid.R;
 
@@ -40,9 +38,6 @@ public class BackupPreferences extends TodorooPreferenceActivity {
 
     private int statusColor = Color.BLACK;
 
-    @Autowired
-    private ActFmPreferenceService actFmPreferenceService;
-
     @Override
     public int getPreferenceResource() {
         return R.xml.preferences_backup;
diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java b/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
index 689e381ef..af1e73883 100644
--- a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
+++ b/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
@@ -14,7 +14,6 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.EditPreferences;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.dao.TagMetadataDao;
@@ -42,9 +41,6 @@ public class CalendarAlarmListCreator extends Activity {
     @Autowired
     private TagDataService tagDataService;
 
-    @Autowired
-    private ActFmPreferenceService actFmPreferenceService;
-
     @Autowired
     private TagMetadataDao tagMetadataDao;
 
diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index d7738a671..24723f600 100644
--- a/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -23,7 +23,6 @@ import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.QueryTemplate;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.AstridFilterExposer;
 import com.todoroo.astrid.api.Filter;
@@ -49,10 +48,9 @@ public class GtasksFilterExposer extends BroadcastReceiver implements AstridFilt
 
     @Autowired
     private GtasksListService gtasksListService;
+
     @Autowired
     private GtasksPreferenceService gtasksPreferenceService;
-    @Autowired
-    private ActFmPreferenceService actFmPreferenceService;
 
     static {
         AstridDependencyInjector.initialize();
diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java
index 7d023d67b..bd3c6c00b 100644
--- a/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java
+++ b/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java
@@ -10,7 +10,6 @@ import android.os.Bundle;
 
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
 import com.todoroo.astrid.gtasks.sync.GtasksSyncV2Provider;
 import com.todoroo.astrid.sync.SyncProviderPreferences;
@@ -29,8 +28,7 @@ public class GtasksPreferences extends SyncProviderPreferences {
 
     @Autowired
     private GtasksPreferenceService gtasksPreferenceService;
-    @Autowired
-    private ActFmPreferenceService actFmPreferenceService;
+
     @Autowired
     private TagService tagService;
 
diff --git a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
index 559bd7086..41e17bd82 100644
--- a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
+++ b/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
@@ -16,7 +16,6 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.dao.MetadataDao;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Metadata;
@@ -49,8 +48,6 @@ public final class GtasksSyncService {
     TaskDao taskDao;
     @Autowired
     GtasksPreferenceService gtasksPreferenceService;
-    @Autowired
-    ActFmPreferenceService actFmPreferenceService;
 
     public GtasksSyncService() {
         DependencyInjectionService.getInstance().inject(this);
diff --git a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
index d08184c17..bd4da487c 100644
--- a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@@ -18,7 +18,6 @@ import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.dao.MetadataDao;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
@@ -71,8 +70,6 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
     @Autowired
     StoreObjectDao storeObjectDao;
     @Autowired
-    ActFmPreferenceService actFmPreferenceService;
-    @Autowired
     GtasksPreferenceService gtasksPreferenceService;
     @Autowired
     GtasksSyncService gtasksSyncService;
diff --git a/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java
index c60df816f..4e53a0c53 100644
--- a/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -43,7 +43,6 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.ActFmCameraModule;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
 import com.todoroo.astrid.actfm.ActFmCameraModule.ClearImageCallback;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncThread;
 import com.todoroo.astrid.actfm.sync.ActFmSyncThread.SyncMessageCallback;
@@ -93,8 +92,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     @Autowired
     ActFmSyncService actFmSyncService;
     @Autowired
-    ActFmPreferenceService actFmPreferenceService;
-    @Autowired
     MetadataService metadataService;
     @Autowired
     UserActivityDao userActivityDao;
diff --git a/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java b/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java
index d6eb712ca..54794ade2 100644
--- a/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java
+++ b/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java
@@ -22,7 +22,6 @@ import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
@@ -37,9 +36,6 @@ import org.astrid.R;
 
 public class ReengagementReceiver extends BroadcastReceiver {
 
-    @Autowired
-    ActFmPreferenceService actFmPreferenceService;
-
     @Autowired
     TaskService taskService;
 
diff --git a/astrid/src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/astrid/src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
index db1dae64b..e68a114be 100644
--- a/astrid/src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
+++ b/astrid/src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
@@ -18,11 +18,9 @@ import com.google.ical.values.DateValueImpl;
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.WeekdayNum;
-import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Task;
@@ -40,9 +38,6 @@ import java.util.TimeZone;
 
 public class RepeatTaskCompleteListener extends BroadcastReceiver {
 
-    @Autowired
-    ActFmPreferenceService actFmPreferenceService;
-
     @Override
     public void onReceive(Context context, Intent intent) {
         ContextManager.setContext(context);
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
index b9a40b64d..f43b38d5d 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
@@ -32,7 +32,6 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.RestClient;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.dao.StoreObjectDao;
 import com.todoroo.astrid.dao.StoreObjectDao.StoreObjectCriteria;
 import com.todoroo.astrid.data.StoreObject;
@@ -66,8 +65,6 @@ public class UpdateMessageService {
     @Autowired
     private GtasksPreferenceService gtasksPreferenceService;
     @Autowired
-    private ActFmPreferenceService actFmPreferenceService;
-    @Autowired
     private StoreObjectDao storeObjectDao;
 
     private final Activity activity;
diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java b/astrid/src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
index 01ab84d15..3c5ac541a 100644
--- a/astrid/src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
+++ b/astrid/src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
@@ -9,7 +9,6 @@ import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
 import com.todoroo.astrid.data.Metadata;
@@ -29,9 +28,6 @@ public class SubtasksMetadataMigration {
     @Autowired
     private MetadataService metadataService;
 
-    @Autowired
-    private ActFmPreferenceService actFmPreferenceService;
-
     @Autowired
     private ActFmSyncService actFmSyncService;
 
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index 6b176f7ff..3220a4301 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -33,7 +33,6 @@ import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.activity.TaskEditFragment;
 import com.todoroo.astrid.activity.TaskListFragment;
@@ -83,8 +82,6 @@ public class QuickAddBar extends LinearLayout {
     @Autowired
     MetadataService metadataService;
     @Autowired
-    ActFmPreferenceService actFmPreferenceService;
-    @Autowired
     private TaskAttachmentDao taskAttachmentDao;
 
     private VoiceRecognizer voiceRecognizer;