diff --git a/android/.classpath b/android/.classpath
index 08607161fe..a4763d1eec 100644
--- a/android/.classpath
+++ b/android/.classpath
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/android/gen/.empty b/android/gen/.empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/android/src/com/retroarch/fileio/FileArrayAdapter.java b/android/src/com/retroarch/fileio/FileArrayAdapter.java
index fed7983c7f..cf04ec8f7d 100644
--- a/android/src/com/retroarch/fileio/FileArrayAdapter.java
+++ b/android/src/com/retroarch/fileio/FileArrayAdapter.java
@@ -7,7 +7,6 @@ import java.util.List;
 import java.util.Set;
 
 import com.retroarch.R;
-import com.retroarch.R.layout;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/android/src/com/retroarch/fileio/FileChooser.java b/android/src/com/retroarch/fileio/FileChooser.java
index ef4b1e2fa6..96f8c43c74 100644
--- a/android/src/com/retroarch/fileio/FileChooser.java
+++ b/android/src/com/retroarch/fileio/FileChooser.java
@@ -1,21 +1,17 @@
 package com.retroarch.fileio;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Stack;
 
 import com.retroarch.R;
-import com.retroarch.main;
-import com.retroarch.R.layout;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -30,8 +26,6 @@ import android.widget.Toast;
 
 public class FileChooser extends Activity
 {
-     private static final String LOG_TAG = "FileChooser";
-     
      public static final String EXTRA_START_DIR = "StartDir";
      public static final String EXTRA_EXTENSIONS = "Extensions";
      public static final String EXTRA_TEMP_DIR = "TempDir";
diff --git a/android/src/com/retroarch/main.java b/android/src/com/retroarch/main.java
index 0aaeca5ab5..c64825c0a0 100644
--- a/android/src/com/retroarch/main.java
+++ b/android/src/com/retroarch/main.java
@@ -17,8 +17,6 @@
 package com.retroarch;
 
 import com.retroarch.R;
-import com.retroarch.R.id;
-import com.retroarch.R.menu;
 import com.retroarch.fileio.FileChooser;
 
 import android.app.Activity;