diff --git a/Source/Android/assets/ButtonA.png b/Source/Android/assets/ButtonA.png
deleted file mode 100644
index 7e685324ae..0000000000
Binary files a/Source/Android/assets/ButtonA.png and /dev/null differ
diff --git a/Source/Android/assets/ButtonB.png b/Source/Android/assets/ButtonB.png
deleted file mode 100644
index 21da4c20f1..0000000000
Binary files a/Source/Android/assets/ButtonB.png and /dev/null differ
diff --git a/Source/Android/assets/ButtonStart.png b/Source/Android/assets/ButtonStart.png
deleted file mode 100644
index e79a9269ee..0000000000
Binary files a/Source/Android/assets/ButtonStart.png and /dev/null differ
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
index d33beee45d..651df513e9 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
@@ -65,6 +65,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 	public boolean onTouch(View v, MotionEvent event)
 	{
 		// Determine the button state to apply based on the MotionEvent action flag.
+		// TODO: This will not work when Axis support is added. Make sure to refactor this when that time comes
+		// The reason it won't work is that when moving an axis, you would get the event MotionEvent.ACTION_MOVE.
 		int buttonState = (event.getAction() == MotionEvent.ACTION_DOWN) ? ButtonState.PRESSED : ButtonState.RELEASED;
 
 		for (InputOverlayDrawable item : overlayItems)
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
index 47f9ef475f..c5d22ff821 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
@@ -241,14 +241,12 @@ public final class VideoSettingsFragment extends PreferenceFragment
 			mainScreen.getPreference(0).setEnabled(false);
 			mainScreen.getPreference(1).setEnabled(false);
 			mainScreen.getPreference(3).setEnabled(false);
-			//mainScreen.getPreference(4).setEnabled(true);
 		}
 		else if (videoBackends.getValue().equals("OGL"))
 		{
 			mainScreen.getPreference(0).setEnabled(true);
 			mainScreen.getPreference(1).setEnabled(true);
 			mainScreen.getPreference(3).setEnabled(true);
-			//mainScreen.getPreference(4).setEnabled(false);
 		}
 
 		// Also set a listener, so that if someone changes the video backend, it will disable
@@ -265,14 +263,12 @@ public final class VideoSettingsFragment extends PreferenceFragment
 						mainScreen.getPreference(0).setEnabled(false);
 						mainScreen.getPreference(1).setEnabled(false);
 						mainScreen.getPreference(3).setEnabled(false);
-						//mainScreen.getPreference(4).setEnabled(true);
 					}
 					else if (preference.getString(key, "Software Renderer").equals("OGL"))
 					{
 						mainScreen.getPreference(0).setEnabled(true);
 						mainScreen.getPreference(1).setEnabled(true);
 						mainScreen.getPreference(3).setEnabled(true);
-						//mainScreen.getPreference(4).setEnabled(false);
 					}
 				}
 			}