diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index f21e3d864..dd763a97d 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -33,7 +33,6 @@ import android.media.AudioManager;
 import android.net.Uri;
 import android.os.PowerManager;
 import android.os.Process;
-import android.os.PowerManager.WakeLock;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -43,10 +42,6 @@ import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
 import com.fsck.k9.SearchSpecification;
-import com.fsck.k9.Account.FolderMode;
-import com.fsck.k9.Account.Searchable;
-import com.fsck.k9.R.drawable;
-import com.fsck.k9.R.string;
 import com.fsck.k9.activity.FolderList;
 import com.fsck.k9.activity.MessageList;
 import com.fsck.k9.helper.Utility;
diff --git a/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java b/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java
index d361e2fe2..e18339e42 100644
--- a/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java
+++ b/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java
@@ -2,13 +2,10 @@ package com.fsck.k9.controller;
 
 import android.app.Application;
 import android.content.Context;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Folder.OpenMode;
@@ -19,8 +16,6 @@ import com.fsck.k9.mail.store.LocalStore.LocalFolder;
 import com.fsck.k9.service.SleepService;
 
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 
 public class MessagingControllerPushReceiver implements PushReceiver
diff --git a/src/com/fsck/k9/service/CoreReceiver.java b/src/com/fsck/k9/service/CoreReceiver.java
index c7ec415a8..ef2fc998e 100644
--- a/src/com/fsck/k9/service/CoreReceiver.java
+++ b/src/com/fsck/k9/service/CoreReceiver.java
@@ -8,7 +8,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
 import com.fsck.k9.K9;
diff --git a/src/com/fsck/k9/service/CoreService.java b/src/com/fsck/k9/service/CoreService.java
index 91c9292c0..7c60a12d8 100644
--- a/src/com/fsck/k9/service/CoreService.java
+++ b/src/com/fsck/k9/service/CoreService.java
@@ -10,7 +10,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import com.fsck.k9.K9;
 import com.fsck.k9.helper.power.TracingPowerManager;
diff --git a/src/com/fsck/k9/service/PollService.java b/src/com/fsck/k9/service/PollService.java
index a5c128724..45eb13d10 100644
--- a/src/com/fsck/k9/service/PollService.java
+++ b/src/com/fsck/k9/service/PollService.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import com.fsck.k9.*;
 import com.fsck.k9.controller.MessagingController;
diff --git a/src/com/fsck/k9/service/SleepService.java b/src/com/fsck/k9/service/SleepService.java
index 705d433bb..94cecca48 100644
--- a/src/com/fsck/k9/service/SleepService.java
+++ b/src/com/fsck/k9/service/SleepService.java
@@ -2,7 +2,6 @@ package com.fsck.k9.service;
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import com.fsck.k9.K9;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;