diff --git a/plugins/Osmand-Nautical/AndroidManifest.xml b/plugins/Osmand-Nautical/AndroidManifest.xml
index 49fa76d58d..670b9d20f6 100644
--- a/plugins/Osmand-Nautical/AndroidManifest.xml
+++ b/plugins/Osmand-Nautical/AndroidManifest.xml
@@ -16,10 +16,12 @@
             android:name="net.osmand.nautical.NauticalActivity"
             android:theme="@style/AppTheme"
             android:label="@string/app_name" >
+            <!--
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            -->
         </activity>
     </application>
 
diff --git a/plugins/Osmand-Nautical/build.gradle b/plugins/Osmand-Nautical/build.gradle
index 7c8d303d13..138b8be4a2 100644
--- a/plugins/Osmand-Nautical/build.gradle
+++ b/plugins/Osmand-Nautical/build.gradle
@@ -63,11 +63,11 @@ repositories {
 }
 
 dependencies {
-	compile 'com.google.firebase:firebase-core:9.8.0'
-	compile 'com.google.firebase:firebase-config:9.8.0'
+	//compile 'com.google.firebase:firebase-core:9.8.0'
+	//compile 'com.google.firebase:firebase-config:9.8.0'
 	compile 'com.android.support:appcompat-v7:23.3.0'
 	compile 'com.android.support:design:23.3.0'
 }
 
-println "Apply GMS plugin"
-apply plugin: 'com.google.gms.google-services'
+//println "Apply GMS plugin"
+//apply plugin: 'com.google.gms.google-services'
diff --git a/plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java b/plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java
index 058a40e7e5..c2bccbd1c2 100644
--- a/plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java
+++ b/plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java
@@ -72,6 +72,7 @@ public class NauticalActivity extends Activity {
 	}
 
 	public void logEvent(Activity ctx, String event) {
+		/*
 		try {
 			Class<?> cl = Class.forName("com.google.firebase.analytics.FirebaseAnalytics");
 			Method mm = cl.getMethod("getInstance", Context.class);
@@ -81,5 +82,6 @@ public class NauticalActivity extends Activity {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		*/
 	}
 }
\ No newline at end of file
diff --git a/plugins/Osmand-ParkingPlugin/AndroidManifest.xml b/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
index 4e9a44d272..b902d4b32d 100644
--- a/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
+++ b/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
@@ -15,10 +15,12 @@
             android:name=".ParkingPluginActivity"
             android:theme="@style/AppTheme"
             android:label="@string/app_name" >
+            <!--
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            -->
         </activity>
     </application>
 
diff --git a/plugins/Osmand-ParkingPlugin/build.gradle b/plugins/Osmand-ParkingPlugin/build.gradle
index 09c642fcc7..a63dd7fc94 100644
--- a/plugins/Osmand-ParkingPlugin/build.gradle
+++ b/plugins/Osmand-ParkingPlugin/build.gradle
@@ -63,11 +63,11 @@ repositories {
 }
 
 dependencies {
-	compile 'com.google.firebase:firebase-core:9.8.0'
-	compile 'com.google.firebase:firebase-config:9.8.0'
+	//compile 'com.google.firebase:firebase-core:9.8.0'
+	//compile 'com.google.firebase:firebase-config:9.8.0'
 	compile 'com.android.support:appcompat-v7:23.3.0'
 	compile 'com.android.support:design:23.3.0'
 }
 
-println "Apply GMS plugin"
-apply plugin: 'com.google.gms.google-services'
+//println "Apply GMS plugin"
+//apply plugin: 'com.google.gms.google-services'
diff --git a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
index 19b6b3f9a2..c43be49da3 100644
--- a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
+++ b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
@@ -71,6 +71,7 @@ public class ParkingPluginActivity extends Activity {
 	}
 
 	public void logEvent(Activity ctx, String event) {
+		/*
 		try {
 			Class<?> cl = Class.forName("com.google.firebase.analytics.FirebaseAnalytics");
 			Method mm = cl.getMethod("getInstance", Context.class);
@@ -80,5 +81,6 @@ public class ParkingPluginActivity extends Activity {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		*/
 	}
 }
\ No newline at end of file
diff --git a/plugins/Osmand-SRTMPlugin/AndroidManifest.xml b/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
index 7579e50b0d..171416cbc9 100644
--- a/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
+++ b/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
@@ -15,10 +15,12 @@
             android:name="net.osmand.srtmPlugin.SRTMPluginActivity"
             android:theme="@style/AppTheme"
             android:label="@string/app_name" >
+            <!--
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            -->
         </activity>
     </application>
 
diff --git a/plugins/Osmand-SRTMPlugin/build.gradle b/plugins/Osmand-SRTMPlugin/build.gradle
index d4f5e0c215..beeb1b7204 100644
--- a/plugins/Osmand-SRTMPlugin/build.gradle
+++ b/plugins/Osmand-SRTMPlugin/build.gradle
@@ -63,11 +63,11 @@ repositories {
 }
 
 dependencies {
-	compile 'com.google.firebase:firebase-core:9.8.0'
-	compile 'com.google.firebase:firebase-config:9.8.0'
+	//compile 'com.google.firebase:firebase-core:9.8.0'
+	//compile 'com.google.firebase:firebase-config:9.8.0'
 	compile 'com.android.support:appcompat-v7:23.3.0'
 	compile 'com.android.support:design:23.3.0'
 }
 
-println "Apply GMS plugin"
-apply plugin: 'com.google.gms.google-services'
+//println "Apply GMS plugin"
+//apply plugin: 'com.google.gms.google-services'
diff --git a/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java b/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
index 173c89445f..fca64769b2 100644
--- a/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
+++ b/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
@@ -73,6 +73,7 @@ public class SRTMPluginActivity extends Activity {
 	}
 
 	public void logEvent(Activity ctx, String event) {
+		/*
 		try {
 			Class<?> cl = Class.forName("com.google.firebase.analytics.FirebaseAnalytics");
 			Method mm = cl.getMethod("getInstance", Context.class);
@@ -82,5 +83,6 @@ public class SRTMPluginActivity extends Activity {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		*/
 	}
 }
\ No newline at end of file
diff --git a/plugins/Osmand-Skimaps/AndroidManifest.xml b/plugins/Osmand-Skimaps/AndroidManifest.xml
index a4278a935d..e937648d0b 100644
--- a/plugins/Osmand-Skimaps/AndroidManifest.xml
+++ b/plugins/Osmand-Skimaps/AndroidManifest.xml
@@ -15,10 +15,12 @@
             android:name="net.osmand.skimaps.SkiMapsActivity"
             android:theme="@style/AppTheme"
             android:label="@string/app_name" >
+            <!--
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            -->
         </activity>
     </application>
 
diff --git a/plugins/Osmand-Skimaps/build.gradle b/plugins/Osmand-Skimaps/build.gradle
index fa42eeb773..129c1d02ac 100644
--- a/plugins/Osmand-Skimaps/build.gradle
+++ b/plugins/Osmand-Skimaps/build.gradle
@@ -64,11 +64,11 @@ repositories {
 }
 
 dependencies {
-	compile 'com.google.firebase:firebase-core:9.8.0'
-	compile 'com.google.firebase:firebase-config:9.8.0'
+	//compile 'com.google.firebase:firebase-core:9.8.0'
+	//compile 'com.google.firebase:firebase-config:9.8.0'
 	compile 'com.android.support:appcompat-v7:23.3.0'
 	compile 'com.android.support:design:23.3.0'
 }
 
-println "Apply GMS plugin"
-apply plugin: 'com.google.gms.google-services'
+//println "Apply GMS plugin"
+//apply plugin: 'com.google.gms.google-services'
diff --git a/plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java b/plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java
index 144fc3ddb4..21ba65c30c 100644
--- a/plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java
+++ b/plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java
@@ -74,6 +74,7 @@ public class SkiMapsActivity extends Activity {
 	}
 
 	public void logEvent(Activity ctx, String event) {
+		/*
 		try {
 			Class<?> cl = Class.forName("com.google.firebase.analytics.FirebaseAnalytics");
 			Method mm = cl.getMethod("getInstance", Context.class);
@@ -83,5 +84,6 @@ public class SkiMapsActivity extends Activity {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		*/
 	}
 }
\ No newline at end of file