diff --git a/android/jni/Application.mk b/android/jni/Application.mk
deleted file mode 100644
index 477f9faf..00000000
--- a/android/jni/Application.mk
+++ /dev/null
@@ -1 +0,0 @@
-APP_OPTIM             := release
diff --git a/android/src/com/reecedunn/espeak/DownloadVoiceData.java b/android/src/com/reecedunn/espeak/DownloadVoiceData.java
index e5481495..0ad9102c 100644
--- a/android/src/com/reecedunn/espeak/DownloadVoiceData.java
+++ b/android/src/com/reecedunn/espeak/DownloadVoiceData.java
@@ -132,7 +132,6 @@ public class DownloadVoiceData extends Activity {
 
                     if (entry.isDirectory()) {
                         progress.file.mkdirs();
-                        FileUtils.chmod(progress.file);
                         continue;
                     }
 
@@ -149,9 +148,6 @@ public class DownloadVoiceData extends Activity {
                         outputStream.close();
                     }
                     zipStream.closeEntry();
-
-                    // Make sure the output file is readable.
-                    FileUtils.chmod(progress.file);
                 }
 
                 final String version = FileUtils.read(mContext.getResources().openRawResource(R.raw.espeakdata_version));
diff --git a/android/src/com/reecedunn/espeak/FileUtils.java b/android/src/com/reecedunn/espeak/FileUtils.java
index 1f93821d..4ac716fe 100644
--- a/android/src/com/reecedunn/espeak/FileUtils.java
+++ b/android/src/com/reecedunn/espeak/FileUtils.java
@@ -71,15 +71,6 @@ public class FileUtils {
         } finally {
             outputStream.close();
         }
-        chmod(outputFile);
-    }
-
-    public static void chmod(File file) {
-        try {
-            Runtime.getRuntime().exec("/system/bin/chmod 755 " + file.getAbsolutePath());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
     }
 
     public static void rmdir(File directory) {
diff --git a/android/src/com/reecedunn/espeak/TtsService.java b/android/src/com/reecedunn/espeak/TtsService.java
index 1af0d9d3..22b9b4e3 100644
--- a/android/src/com/reecedunn/espeak/TtsService.java
+++ b/android/src/com/reecedunn/espeak/TtsService.java
@@ -63,7 +63,7 @@ public class TtsService extends TextToSpeechService {
 
     private static final String TAG = TtsService.class.getSimpleName();
     private static Context storageContext;
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = BuildConfig.DEBUG;
 
     private SpeechSynthesis mEngine;
     private SynthesisCallback mCallback;