diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 21575c2c..b7f33f91 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -31,14 +31,12 @@ import android.app.NotificationManager;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
@@ -46,7 +44,6 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
-import android.provider.MediaStore;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -744,7 +741,6 @@ public final class PlaybackService extends Service implements Handler.Callback,
 
 	private static final int GO = 0;
 	private static final int POST_CREATE = 1;
-	private static final int MEDIA_BUTTON = 2;
 	private static final int CREATE = 3;
 	/**
 	 * This message is sent with a delay specified by a user preference. After
@@ -781,9 +777,6 @@ public final class PlaybackService extends Service implements Handler.Callback,
 	public boolean handleMessage(Message message)
 	{
 		switch (message.what) {
-		case MEDIA_BUTTON:
-			toggleFlag(FLAG_PLAYING);
-			break;
 		case TRACK_CHANGED:
 			setCurrentSong(+1);
 			setFlag(FLAG_PLAYING);
diff --git a/src/org/kreed/vanilla/SongSelector.java b/src/org/kreed/vanilla/SongSelector.java
index 74f5c317..2404eba3 100644
--- a/src/org/kreed/vanilla/SongSelector.java
+++ b/src/org/kreed/vanilla/SongSelector.java
@@ -22,7 +22,6 @@
 
 package org.kreed.vanilla;
 
-import android.content.ContentResolver;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -31,10 +30,8 @@ import android.graphics.Color;
 import android.graphics.drawable.PaintDrawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
-import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/src/org/kreed/vanilla/SongTimeline.java b/src/org/kreed/vanilla/SongTimeline.java
index e8afbaa9..9447c7bf 100644
--- a/src/org/kreed/vanilla/SongTimeline.java
+++ b/src/org/kreed/vanilla/SongTimeline.java
@@ -28,7 +28,6 @@ import java.io.EOFException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Random;
 
 import android.content.Context;
 import android.util.Log;