diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 221bdfd8e26f2f80a3e88bbde29647db4fcc099f..2ee3b29ba3c8e51bc244328b78f4905f99fb6136 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,8 +41,7 @@
         <service
             android:name=".service.TokenCheckService"
             android:enabled="true"
-            android:exported="true"
-            android:permission="TODO" />
+            android:exported="false" />
 
         <activity
             android:name=".LoginActivity"
diff --git a/app/src/main/java/com/example/nerbos/MapsActivity.kt b/app/src/main/java/com/example/nerbos/MapsActivity.kt
index a64b601073689c8b66161c0863deea77583e9d61..379decb3c71a4f4646959a55253d2e197c3e6015 100644
--- a/app/src/main/java/com/example/nerbos/MapsActivity.kt
+++ b/app/src/main/java/com/example/nerbos/MapsActivity.kt
@@ -1,30 +1,19 @@
 package com.example.nerbos
 
-import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.graphics.Camera
 import android.location.Address
 import android.location.Geocoder
-import android.location.Location
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.util.Log
 import android.widget.ImageView
-import android.widget.TextView
 import android.widget.Toast
-import androidx.core.app.ActivityCompat
-
+import androidx.appcompat.app.AppCompatActivity
+import com.example.nerbos.databinding.ActivityMapsBinding
 import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.OnMapReadyCallback
 import com.google.android.gms.maps.SupportMapFragment
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MarkerOptions
-import com.example.nerbos.databinding.ActivityMapsBinding
-import com.google.android.gms.location.FusedLocationProviderClient
-import com.google.android.gms.location.LocationServices
-import com.google.android.gms.maps.model.Marker
 import java.util.Locale
 
 class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
@@ -32,6 +21,7 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
     private lateinit var mMap: GoogleMap
     private lateinit var binding: ActivityMapsBinding
     private lateinit var location: Address
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -46,7 +36,7 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
         val myIntent = intent
         val locationName : String? = myIntent.getStringExtra("locationName")
         val geocoder = Geocoder(this, Locale.getDefault())
-        val address = geocoder.getFromLocationName(locationName!!, 1)
+        @Suppress("DEPRECATION") val address = geocoder.getFromLocationName(locationName!!, 1)
         if (address != null) {
             if (address.size > 0) {
                 location = address[0]