diff --git a/plugin.xml b/plugin.xml
index 3d6ccae6f..f122d6dfe 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -17,35 +17,27 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-           id="cordova-plugin-fcm"
-      version="2.1.2">
-    <name>FCMPlugin</name>
-    <description>Cordova FCM Plugin</description>
-    <license>Apache 2.0</license>
-    <keywords>cordova, fcm, push, plugin</keywords>
-    
-    <info>
-		Cordova FCM plugin v2.1.2 installed
-		For more details visit https://github.com/fechanique/cordova-plugin-fcm
-	</info>
-	
-    <js-module src="www/FCMPlugin.js" name="FCMPlugin">
-	<clobbers target="FCMPlugin" />
-    </js-module>
-
-    <engines>
-	<engine name="cordova-android" version=">=4.0.0" />
-    </engines>
-	
-    <!-- ANDROID CONFIGURATION -->
-    <platform name="android">
+<plugin 
+	xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-fcm" version="2.1.2">
+	<name>FCMPlugin</name>
+	<description>Cordova FCM Plugin</description>
+	<license>Apache 2.0</license>
+	<keywords>cordova, fcm, push, plugin</keywords>
+	<info>		Cordova FCM plugin v2.1.2 installed		For more details visit https://github.com/fechanique/cordova-plugin-fcm	</info>
+	<js-module src="www/FCMPlugin.js" name="FCMPlugin">
+		<clobbers target="FCMPlugin" />
+	</js-module>
+	<engines>
+		<engine name="cordova-android" version=">=4.0.0" />
+	</engines>
+	<!-- ANDROID CONFIGURATION -->
+	<platform name="android">
 		<config-file target="AndroidManifest.xml" parent="/manifest/application">
 			<activity android:exported="true" android:name="com.gae.scaffolder.plugin.FCMPluginActivity" android:launchMode="singleTop">
-				<intent-filter>   
-					<action android:name="FCM_PLUGIN_ACTIVITY" />  
+				<intent-filter>
+					<action android:name="FCM_PLUGIN_ACTIVITY" />
 					<category android:name="android.intent.category.DEFAULT" />
-				</intent-filter>			
+				</intent-filter>
 			</activity>
 			<service android:name="com.gae.scaffolder.plugin.MyFirebaseMessagingService">
 				<intent-filter>
@@ -59,50 +51,40 @@
 			</service>
 		</config-file>
 		<config-file target="res/xml/config.xml" parent="/*">
-			<feature name="FCMPlugin" >
-					<param name="android-package" value="com.gae.scaffolder.plugin.FCMPlugin"/>
-					<param name="onload" value="true" />
-				</feature>
+			<feature name="FCMPlugin">
+				<param name="android-package" value="com.gae.scaffolder.plugin.FCMPlugin"/>
+				<param name="onload" value="true" />
+			</feature>
 		</config-file>
-		
-        <framework src="com.google.firebase:firebase-core:+" />
-        <framework src="com.google.firebase:firebase-messaging:+" />
-		
-		<framework src="src/android/FCMPlugin.gradle" custom="true" type="gradleReference"/>
-			
+		<framework src="com.google.firebase:firebase-core:+" />
+		<framework src="com.google.firebase:firebase-messaging:+" />
+		<dependency id="cordova-support-google-services" version="~1.1.0"/>
 		<source-file src="src/android/FCMPlugin.java" target-dir="src/com/gae/scaffolder/plugin" />
 		<source-file src="src/android/MyFirebaseMessagingService.java" target-dir="src/com/gae/scaffolder/plugin" />
 		<source-file src="src/android/MyFirebaseInstanceIDService.java" target-dir="src/com/gae/scaffolder/plugin" />
 		<source-file src="src/android/FCMPluginActivity.java" target-dir="src/com/gae/scaffolder/plugin" />
-    </platform>
-	
-    <!-- IOS CONFIGURATION -->
-    <platform name="ios">
-        <config-file target="config.xml" parent="/*">
-            <feature name="FCMPlugin">
-                <param name="ios-package" value="FCMPlugin"/>
-            </feature>
-        </config-file>
-		
+	</platform>
+	<!-- IOS CONFIGURATION -->
+	<platform name="ios">
+		<config-file target="config.xml" parent="/*">
+			<feature name="FCMPlugin">
+				<param name="ios-package" value="FCMPlugin"/>
+			</feature>
+		</config-file>
 		<!-- ENABLE PUSH CAPABILITY -->
 		<config-file parent="aps-environment" target="*/Entitlements-Debug.plist">
-		    <string>development</string>
+			<string>development</string>
 		</config-file>
 		<config-file parent="aps-environment" target="*/Entitlements-Release.plist">
 			<string>production</string>
 		</config-file>
-		
 		<resource-file src="src/ios/GoogleService-Info.plist" target="Resources/GoogleService-Info.plist" />
-		
-        <header-file src="src/ios/FCMPlugin.h" />
-        <source-file src="src/ios/FCMPlugin.m" />
-		
+		<header-file src="src/ios/FCMPlugin.h" />
+		<source-file src="src/ios/FCMPlugin.m" />
 		<header-file src="src/ios/AppDelegate+FCMPlugin.h" />
 		<source-file src="src/ios/AppDelegate+FCMPlugin.m" />
-		
 		<!-- FIREBASE COCOA PODS (not for the moment)-->
 		<!-- <framework src="Firebase/Messaging" type="podspec" spec="~> 0"/> -->
-		
 		<!-- FIREBASE LIBS -->
 		<header-file src="src/ios/firebase/Firebase.h" />
 		<framework src="src/ios/firebase/FirebaseAnalytics.framework" custom="true" />
@@ -113,7 +95,6 @@
 		<framework src="src/ios/firebase/GoogleIPhoneUtilities.framework" custom="true" />
 		<framework src="src/ios/firebase/GoogleSymbolUtilities.framework" custom="true" />
 		<framework src="src/ios/firebase/GoogleUtilities.framework" custom="true" />
-			
 		<!-- OTHER NEEDED LIBS -->
 		<framework src="libc++.tbd" />
 		<framework src="libz.tbd" />
@@ -121,10 +102,8 @@
 		<framework src="libsqlite3.0.tbd" />
 		<framework src="libz.tbd" />
 		<framework src="Security.framework" />
-    </platform>
-	
+	</platform>
 	<!-- COPY FCM CONFIG FILES TO PLATFORM AFTER PLUGIN INSTALL OR PLATFORM PREPARE -->
 	<hook src="scripts/fcm_config_files_process.js" type="after_plugin_add" />
 	<hook src="scripts/fcm_config_files_process.js" type="after_prepare" />
-	
-</plugin>
+</plugin>
\ No newline at end of file
diff --git a/src/android/FCMPlugin.gradle b/src/android/FCMPlugin.gradle
deleted file mode 100644
index 4ab3a0990..000000000
--- a/src/android/FCMPlugin.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-buildscript {
-	repositories {
-            jcenter()
-			mavenLocal()
-        }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:+'
-        classpath 'com.google.gms:google-services:3.0.0'
-    }
-}
-// apply plugin: 'com.google.gms.google-services'
-// class must be used instead of id(string) to be able to apply plugin from non-root gradle file
-apply plugin: com.google.gms.googleservices.GoogleServicesPlugin
\ No newline at end of file