diff --git a/shell/android/src/com/android/util/FileUtils.java b/shell/android/src/com/android/util/FileUtils.java
index 652f2d12c..bac1e044f 100755
--- a/shell/android/src/com/android/util/FileUtils.java
+++ b/shell/android/src/com/android/util/FileUtils.java
@@ -23,7 +23,6 @@ import android.graphics.Bitmap;
 import android.media.MediaScannerConnection;
 import android.media.MediaScannerConnection.OnScanCompletedListener;
 import android.net.Uri;
-import android.util.Log;
 
 import com.reicast.emulator.MainActivity;
 
diff --git a/shell/android/src/com/reicast/emulator/AboutFragment.java b/shell/android/src/com/reicast/emulator/AboutFragment.java
index 65024d6b9..f60031ae3 100644
--- a/shell/android/src/com/reicast/emulator/AboutFragment.java
+++ b/shell/android/src/com/reicast/emulator/AboutFragment.java
@@ -18,10 +18,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.annotation.TargetApi;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
@@ -32,8 +30,6 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
-import android.widget.SlidingDrawer;
-import android.widget.SlidingDrawer.OnDrawerOpenListener;
 import android.widget.TextView;
 
 import com.reicast.emulator.config.Config;
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index c3e920808..931ca983c 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -14,21 +14,19 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.preference.PreferenceManager;
+import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import android.support.v4.widget.DrawerLayout;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -46,9 +44,6 @@ import com.reicast.emulator.debug.GenerateLogs;
 import com.reicast.emulator.emu.JNIdc;
 import com.reicast.emulator.periph.Gamepad;
 
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.widget.DrawerLayout;
-
 public class MainActivity extends FragmentActivity implements
 		FileBrowser.OnItemSelectedListener, OptionsFragment.OnClickListener {
 	
@@ -101,7 +96,6 @@ public class MainActivity extends FragmentActivity implements
 				public void uncaughtException(Thread t, Throwable error) {
 					if (error != null) {
 						StringBuilder output = new StringBuilder();
-						output.append("UncaughtException:\n");
 						for (StackTraceElement trace : error.getStackTrace()) {
 							output.append(trace.toString() + "\n");
 						}
diff --git a/shell/android/src/com/reicast/emulator/config/InputFragment.java b/shell/android/src/com/reicast/emulator/config/InputFragment.java
index 633076e49..f215bf241 100644
--- a/shell/android/src/com/reicast/emulator/config/InputFragment.java
+++ b/shell/android/src/com/reicast/emulator/config/InputFragment.java
@@ -26,6 +26,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
+import android.widget.Switch;
 import android.widget.TableLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -39,8 +40,6 @@ import com.reicast.emulator.R;
 import com.reicast.emulator.periph.Gamepad;
 import com.reicast.emulator.periph.MOGAInput;
 
-import de.ankri.views.Switch;
-
 public class InputFragment extends Fragment {
 
 	private Activity parentActivity;
diff --git a/shell/android/src/com/reicast/emulator/config/InputModFragment.java b/shell/android/src/com/reicast/emulator/config/InputModFragment.java
index 76cdff3bc..a50940385 100644
--- a/shell/android/src/com/reicast/emulator/config/InputModFragment.java
+++ b/shell/android/src/com/reicast/emulator/config/InputModFragment.java
@@ -34,13 +34,12 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageView;
 import android.widget.Spinner;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import com.reicast.emulator.R;
 import com.reicast.emulator.periph.Gamepad;
 
-import de.ankri.views.Switch;
-
 public class InputModFragment extends Fragment {
 
 	private SharedPreferences mPrefs;
diff --git a/shell/android/src/com/reicast/emulator/config/OptionsFragment.java b/shell/android/src/com/reicast/emulator/config/OptionsFragment.java
index c52e3c1d1..eea8252e4 100644
--- a/shell/android/src/com/reicast/emulator/config/OptionsFragment.java
+++ b/shell/android/src/com/reicast/emulator/config/OptionsFragment.java
@@ -38,7 +38,7 @@ import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.Spinner;
-import android.widget.TextView;
+import android.widget.Switch;
 import android.widget.Toast;
 
 import com.android.util.FileUtils;
@@ -47,8 +47,6 @@ import com.reicast.emulator.R;
 import com.reicast.emulator.emu.GL2JNIView;
 import com.reicast.emulator.emu.JNIdc;
 
-import de.ankri.views.Switch;
-
 public class OptionsFragment extends Fragment {
 
 	private Config config;
diff --git a/shell/android/src/com/reicast/emulator/debug/GenerateLogs.java b/shell/android/src/com/reicast/emulator/debug/GenerateLogs.java
index 5b3599caf..2703eba8e 100644
--- a/shell/android/src/com/reicast/emulator/debug/GenerateLogs.java
+++ b/shell/android/src/com/reicast/emulator/debug/GenerateLogs.java
@@ -9,13 +9,13 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import com.reicast.emulator.R;
-
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.widget.Toast;
 
+import com.reicast.emulator.R;
+
 public class GenerateLogs extends AsyncTask<String, Integer, String> {
 
 	public static final String build_model = android.os.Build.MODEL;
diff --git a/shell/android/src/com/reicast/emulator/debug/GitAdapter.java b/shell/android/src/com/reicast/emulator/debug/GitAdapter.java
index 4411297cc..b01c7bd5e 100644
--- a/shell/android/src/com/reicast/emulator/debug/GitAdapter.java
+++ b/shell/android/src/com/reicast/emulator/debug/GitAdapter.java
@@ -9,7 +9,6 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Build;
 import android.view.LayoutInflater;
@@ -114,7 +113,7 @@ public class GitAdapter extends BaseAdapter {
 		return vi;
 	}
 
-	public static void displayCommit(final String title, String message, String url,
+	private void displayCommit(final String title, String message, String url,
 			Context context) {
 		final AlertDialog.Builder builder = new AlertDialog.Builder(context);
 		builder.setCancelable(true);
diff --git a/shell/android/src/com/reicast/emulator/debug/UploadLogs.java b/shell/android/src/com/reicast/emulator/debug/UploadLogs.java
index a776e3a99..38f13f60a 100644
--- a/shell/android/src/com/reicast/emulator/debug/UploadLogs.java
+++ b/shell/android/src/com/reicast/emulator/debug/UploadLogs.java
@@ -15,8 +15,6 @@ import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
-import com.reicast.emulator.config.Config;
-
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -26,6 +24,8 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.StrictMode;
 
+import com.reicast.emulator.config.Config;
+
 /**
  * Upload the specialized logcat to reicast issues
  *