diff --git a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
index 2f264ca..0566fbd 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
@@ -10,7 +10,6 @@
     private String password=null;
     private String name = null;
     private Location location;
-    private Location CLocation;
     
     public void setUid(String uid) {
         SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
@@ -83,11 +82,4 @@
 
     }
 
-    public void setCurrentLocation(Location location){
-        CLocation=location;
-    }
-    public Location getCurrentLocation(){
-        return CLocation;
-    }
-
 }
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
index aacd82d..32e21ef 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
@@ -56,29 +56,9 @@
         NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
         NavigationUI.setupWithNavController(navView, navController);
 
-//        if (ContextCompat.checkSelfPermission(this,
-//                Manifest.permission.ACCESS_FINE_LOCATION) !=
-//                PackageManager.PERMISSION_GRANTED) {
-//            ActivityCompat.requestPermissions(this,
-//                    new String[]{Manifest.permission.ACCESS_FINE_LOCATION,},
-//                    1000);
-//        }
-//        else{
-//            locationStart();
-//            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 100, 50, this);
-//
-//
-//        }
 
         LocationManager manager = (LocationManager) getSystemService(LOCATION_SERVICE);
         if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            // TODO: Consider calling
-            //    ActivityCompat#requestPermissions
-            // here to request the missing permissions, and then overriding
-            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
-            //                                          int[] grantResults)
-            // to handle the case where the user grants the permission. See the documentation
-            // for ActivityCompat#requestPermissions for more details.
             return;
         }
         manager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
@@ -109,23 +89,10 @@
             Log.d("debug", "checkSelfPermission false");
             return;
         }
-
-       // locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 50, this);
-
     }
 
     // 結果の受け取り
-    /**
-     * Android Quickstart:
-     * https://developers.google.com/sheets/api/quickstart/android
-     *
-     * Respond to requests for permissions at runtime for API 23 and above.
-     * @param requestCode The request code passed in
-     *     requestPermissions(android.app.Activity, String, int, String[])
-     * @param permissions The requested permissions. Never null.
-     * @param grantResults The grant results for the corresponding permissions
-     *     which is either PERMISSION_GRANTED or PERMISSION_DENIED. Never null.
-     */
+
     @Override
     public void onRequestPermissionsResult(
             int requestCode, @NonNull String[]permissions, @NonNull int[] grantResults) {
@@ -147,19 +114,6 @@
 
     @Override
     public void onStatusChanged(String provider, int status, Bundle extras) {
-//         API 29以降非推奨
-
-//        switch (status) {
-//            case LocationProvider.AVAILABLE:
-//                Log.d("debug", "LocationProvider.AVAILABLE");
-//                break;
-//            case LocationProvider.OUT_OF_SERVICE:
-//                Log.d("debug", "LocationProvider.OUT_OF_SERVICE");
-//                break;
-//            case LocationProvider.TEMPORARILY_UNAVAILABLE:
-//                Log.d("debug", "LocationProvider.TEMPORARILY_UNAVAILABLE");
-//                break;
-//        }
 
     }
 
@@ -171,12 +125,6 @@
     }
     @Override
     public void onLocationChanged(Location location) {
-//        Amaryllis amaryllis = (Amaryllis) getApplication();
-//        String latitude = String.valueOf(location.getLatitude());
-//        String longitude = String.valueOf(location.getLongitude());
-//        amaryllis.setLatitude(latitude);
-//        amaryllis.setLongitude(longitude);
-
         Log.d(TAG, "lat:" + location.getLatitude());
         Log.d(TAG, "lon:" + location.getLongitude());
         Log.d("debug", "locationChanged" );
@@ -187,8 +135,6 @@
         double latitude,longitude;
         latitude=location.getLatitude();
         longitude=location.getLatitude();
-        Amaryllis amaryllis = (Amaryllis) getApplication();
-        amaryllis.setCurrentLocation(location);
 
     }
     @Override