diff --git a/app/src/main/java/com/example/cameraxtestappjava/segpass/SegpassCamera.java b/app/src/main/java/com/example/cameraxtestappjava/segpass/SegpassCamera.java
index 9f8f8dd..2f17265 100644
--- a/app/src/main/java/com/example/cameraxtestappjava/segpass/SegpassCamera.java
+++ b/app/src/main/java/com/example/cameraxtestappjava/segpass/SegpassCamera.java
@@ -139,12 +139,6 @@ public class SegpassCamera {
      */
     private String mBase64Value;
 
-    private static final CaptureRequest.Key<Integer> mCaptureAfModeKey = CaptureRequest.CONTROL_AF_MODE;
-    private static final int mCaptureAfModeValue = CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE;
-
-    private static final CaptureRequest.Key<Integer> mCaptureAfTriggerKey = CaptureRequest.CONTROL_AF_TRIGGER;
-    private static final int mCaptureAfTriggerValue = CameraMetadata.CONTROL_AF_TRIGGER_START;
-
     /**
      * {@link CaptureRequest.Builder} for the camera preview
      */
@@ -590,9 +584,9 @@ public class SegpassCamera {
                             mCaptureSession = cameraCaptureSession;
                             try {
                                 // Auto focus should be continuous for camera preview.
-                                mPreviewRequestBuilder.set(mCaptureAfModeKey, mCaptureAfModeValue);
+                                mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE, CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
                                 // Trigger AF
-                                mPreviewRequestBuilder.set(mCaptureAfTriggerKey, mCaptureAfTriggerValue);
+                                mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_START);
 
                                 // Finally, we start displaying the camera preview.
                                 mPreviewRequest = mPreviewRequestBuilder.build();
@@ -706,7 +700,7 @@ public class SegpassCamera {
                         mCameraCallback.onPictureTakenFailError("Error saving picture...");
                     }
                     Log.d(TAG, "Recreating camera preview...");
-                    mCaptureImageReader.close();
+                    //mCaptureImageReader.close();
                     createCameraPreviewSession();
                 }
             };
@@ -728,7 +722,7 @@ public class SegpassCamera {
                 }
             }, mBackgroundHandler);
         } catch (CameraAccessException e) {
-            Log.e(TAG, "takePicture(): " + e.getMessage());
+            Log.e(TAG, "CameraAccessException@takePicture(): " + e.getMessage());
             mCameraCallback.onCameraInitError(ERROR_CAMERA_ACCESS);
         }