diff --git a/amap/src/main/java/com/bcm/messenger/map/GDMapFragment.kt b/amap/src/main/java/com/bcm/messenger/map/GDMapFragment.kt
deleted file mode 100644
index e69de29b..00000000
diff --git a/amap/src/main/res/drawable/amap_gps_locale_icon.xml b/amap/src/main/res/drawable/amap_gps_locale_icon.xml
deleted file mode 100644
index 0b598e7f..00000000
--- a/amap/src/main/res/drawable/amap_gps_locale_icon.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-  <path
-      android:pathData="M20,20m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
-      android:fillAlpha="1"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M20,20m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-      android:strokeWidth="2"
-      android:fillColor="#379BFF"
-      android:fillType="evenOdd"
-      android:strokeColor="#FFFFFF"/>
-</vector>
diff --git a/build.gradle b/build.gradle
index 1f66b5c9..69d6cd01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,12 @@
-//apply plugin: 'architecture-lint'
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = '1.3.41'
 
     repositories {
+        google()
+        jcenter()
         maven { url uri('./thirdpart/repo') }
-        maven { url 'http://repo.yypm.com:8181/nexus/content/groups/public' }
+        maven { url 'https://dl.bintray.com/umsdk/release' }
         maven { url 'http://storage.googleapis.com/r8-releases/raw' }
     }
     dependencies {
@@ -12,22 +15,20 @@ buildscript {
         classpath 'com.bcm.plugin.fcm:analytics_disable:1.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
-//        classpath files('app/libs/gradle-witness.jar')
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-//        classpath 'com.google.gms:google-services:4.3.2'
-//        classpath 'io.fabric.tools:gradle:1.25.1'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6'
-
-        //classpath "tv.athena:api-gradle-plugin:2.2.3"
-        //classpath "de.undercouch:gradle-download-task:3.2.0"
     }
 }
 
 allprojects {
     repositories {
+        google()
+        jcenter()
         maven { url uri('../thirdpart/repo') }
-        maven { url 'http://repo.yypm.com:8181/nexus/content/groups/public' }
+        maven { url 'https://dl.bintray.com/umsdk/release' }
+        maven { url "https://jitpack.io" }
+        maven {
+            url "https://s3.amazonaws.com/repo.commonsware.com"
+        }
     }
 
     subprojects {
@@ -78,13 +79,7 @@ allprojects {
 }
 
 static def getAppId() {
-    if (branch().startsWith("origin/release") || branch().startsWith("release")) {
-        return "com.bcm.messenger"
-    } else if (branch().length() == 0) {
-        return "com.bcm.messenger.local"
-    } else {
-        return "com.bcm.messenger.dev"
-    }
+    return "com.bcm.messenger.dev"
 }
 
 static def branch() {