diff --git a/app/build.gradle b/app/build.gradle
index 0b4c65850..1dbe61546 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -311,7 +311,6 @@ android {
             buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
             buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
             buildConfigField "String", "DEPICTS_PROPERTY", "\"P180\""
-            buildConfigField "String", "MapboxAccessToken", "\"$MAPBOX_ACCESS_TOKEN\""
             dimension 'tier'
         }
 
@@ -347,7 +346,6 @@ android {
             buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
             buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
             buildConfigField "String", "DEPICTS_PROPERTY", "\"P245962\""
-            buildConfigField "String", "MapboxAccessToken", "\"$MAPBOX_ACCESS_TOKEN\""
             dimension 'tier'
         }
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index eeb7e0a93..9305e82ea 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -22,8 +22,6 @@ import androidx.multidex.MultiDexApplication;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
-import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.WellKnownTileServer;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
@@ -157,7 +155,6 @@ public class CommonsApplication extends MultiDexApplication {
 
         INSTANCE = this;
         ACRA.init(this);
-        Mapbox.getInstance(this, BuildConfig.MapboxAccessToken, WellKnownTileServer.Mapbox);
 
         ApplicationlessInjection
             .getInstance(this)
diff --git a/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java b/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java
index 3ff02da07..4c7289ea5 100644
--- a/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java
+++ b/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java
@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.location;
 
-import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
-
 import android.Manifest.permission;
 import android.app.Activity;
 import android.content.Context;
@@ -30,6 +28,7 @@ public class LocationServiceManager implements LocationListener {
     private final List<LocationUpdateListener> locationListeners = new CopyOnWriteArrayList<>();
     private boolean isLocationManagerRegistered = false;
     private Set<Activity> locationExplanationDisplayed = new HashSet<>();
+    private Context context;
 
     /**
      * Constructs a new instance of LocationServiceManager.
@@ -37,6 +36,7 @@ public class LocationServiceManager implements LocationListener {
      * @param context the context
      */
     public LocationServiceManager(Context context) {
+        this.context = context;
         this.locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
     }
 
@@ -58,9 +58,9 @@ public class LocationServiceManager implements LocationListener {
         Location bestLocation = null;
         for (String provider : providers) {
             Location l=null;
-            if (ActivityCompat.checkSelfPermission(getApplicationContext(), permission.ACCESS_FINE_LOCATION)
+            if (ActivityCompat.checkSelfPermission(context, permission.ACCESS_FINE_LOCATION)
                 == PackageManager.PERMISSION_GRANTED
-                && ActivityCompat.checkSelfPermission(getApplicationContext(), permission.ACCESS_COARSE_LOCATION)
+                && ActivityCompat.checkSelfPermission(context, permission.ACCESS_COARSE_LOCATION)
                 == PackageManager.PERMISSION_GRANTED) {
                 l = locationManager.getLastKnownLocation(provider);
             }
diff --git a/gradle.properties b/gradle.properties
index 9e5abe9ad..eb18ace59 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -39,4 +39,3 @@ android.jetifier.ignorelist=bcprov-jdk15on
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
-MAPBOX_ACCESS_TOKEN=pk.eyJ1Ijoibmljb2xhcy1yYW91bCIsImEiOiJjbHJrNGZyZTcwMDA0MmpwbjJjemt3MGE3In0.o9NrQuQeJ_oz3-lbS4MLvw