diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index 88d52b36..a6ce0f0b 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -407,9 +407,11 @@ public class MicroPhotoService extends Service {
                         @Override
                         public void run() {
                             Bitmap bm = null;
+                            File rawFile = new File(path);
                             try {
                                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                                    ImageDecoder.Source src = ImageDecoder.createSource(new File(path));
+
+                                    ImageDecoder.Source src = ImageDecoder.createSource(rawFile);
                                     ImageDecoder.OnHeaderDecodedListener listener =
                                             new ImageDecoder.OnHeaderDecodedListener(){
                                                 @Override
@@ -426,6 +428,11 @@ public class MicroPhotoService extends Service {
                             } catch (Exception ex) {
                             }
                             mService.captureFinished(mService.mNativeHandle, photoOrVideo, result && bm != null, bm, videoId);
+                            try {
+                                rawFile.delete();
+                            } catch (Exception ex) {
+                                ex.printStackTrace();
+                            }
                         }
                     });
 
diff --git a/app/src/main/java/com/xypower/mpapp/video/RawActivity.java b/app/src/main/java/com/xypower/mpapp/video/RawActivity.java
index 165e2682..a317f6bf 100644
--- a/app/src/main/java/com/xypower/mpapp/video/RawActivity.java
+++ b/app/src/main/java/com/xypower/mpapp/video/RawActivity.java
@@ -1338,6 +1338,7 @@ public class RawActivity extends AppCompatActivity {
             int format = mImage.getFormat();
             switch (format) {
                 case ImageFormat.JPEG: {
+                    /*
                     ByteBuffer buffer = mImage.getPlanes()[0].getBuffer();
                     byte[] bytes = new byte[buffer.remaining()];
                     buffer.get(bytes);
@@ -1352,6 +1353,7 @@ public class RawActivity extends AppCompatActivity {
                         mImage.close();
                         closeOutput(output);
                     }
+                     */
                     break;
                 }
                 case ImageFormat.RAW_SENSOR: {