diff --git a/app/build.gradle b/app/build.gradle
index 87a09c3a..a18480fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -146,9 +146,9 @@ dependencies {
     annotationProcessor "frankiesardo:icepick-processor:${icepickVersion}"
     annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
     provided "org.projectlombok:lombok:${lombokVersion}"
-    gmsCompile "com.google.firebase:firebase-ads:${firebase}"
-    gmsCompile "com.google.firebase:firebase-messaging:${firebase}"
     if (isGms) {
+        compile "com.google.firebase:firebase-ads:${firebase}"
+        compile "com.google.firebase:firebase-messaging:${firebase}"
         releaseCompile "com.google.firebase:firebase-crash:${firebase}"
     }
 }
diff --git a/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java b/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java
deleted file mode 100644
index 70aa6b0b..00000000
--- a/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.fastaccess.provider.fcm;
-
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
-
-import com.fastaccess.R;
-import com.fastaccess.ui.modules.main.MainActivity;
-import com.google.firebase.messaging.FirebaseMessagingService;
-import com.google.firebase.messaging.RemoteMessage;
-
-/**
- * Created by Kosh on 16 Apr 2017, 1:17 PM
- */
-
-public class PushNotificationService extends FirebaseMessagingService {
-
-    @Override public void onMessageReceived(RemoteMessage remoteMessage) {
-        super.onMessageReceived(remoteMessage);
-        String title = remoteMessage.getNotification().getTitle();
-        String body = remoteMessage.getNotification().getBody();
-        if (remoteMessage.getData() != null && !remoteMessage.getData().isEmpty()) {
-            title = title == null ? remoteMessage.getData().get("title") : title;
-            body = body == null ? remoteMessage.getData().get("message") : body;
-        }
-        Intent intent = new Intent(this, MainActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT);
-        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this)
-                .setSmallIcon(R.drawable.ic_notification)
-                .setContentTitle(title)
-                .setContentText(body)
-                .setAutoCancel(true)
-                .setContentIntent(pendingIntent);
-        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(1, notificationBuilder.build());
-    }
-}