diff --git a/java/systems/obsidian/LocalFirebaseMessagingService.java b/java/systems/obsidian/LocalFirebaseMessagingService.java
deleted file mode 100644
index 01a35628..00000000
--- a/java/systems/obsidian/LocalFirebaseMessagingService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// File based on https://github.com/firebase/quickstart-android/blob/d454ecdbb664450d11812b9cfde91fca36c56a81/messaging/app/src/main/java/com/google/firebase/quickstart/fcm/java/MyFirebaseMessagingService.java
-package systems.obsidian;
-
-import android.util.Log;
-import com.google.firebase.messaging.FirebaseMessagingService;
-import com.google.firebase.messaging.RemoteMessage;
-
-public class LocalFirebaseMessagingService extends FirebaseMessagingService {
-
-  private static final String TAG = "LocalFirebaseMessagingService";
-
-  private native void handleDeviceToken(String token);
-  private native void handleNotification(String intent, String notificationdata);
-
-  /**
-    * Called if InstanceID token is updated. This may occur if the security of
-    * the previous token had been compromised. Note that this is called when the InstanceID token
-    * is initially generated so this is where you would retrieve the token.
-    */
-  @Override
-  public void onNewToken(String token) {
-    Log.d(TAG, "onNewToken: Refreshed token: " + token);
-
-    // If you want to send messages to this application instance or
-    // manage this apps subscriptions on the server side, send the
-    // Instance ID token to your app server.
-    handleDeviceToken(token);
-  }
-
-  @Override
-  public void onMessageReceived(RemoteMessage remoteMessage) {
-    if (remoteMessage.getData().size() > 0) {
-      String custom = remoteMessage.getData().get("custom");
-      if (custom != null) {
-        handleNotification("custom-foreground", custom);
-      }
-    }
-  }
-}
diff --git a/src/Android/HaskellActivity.hsc b/src/Android/HaskellActivity.hsc
index 38a3c56c..1790eb95 100644
--- a/src/Android/HaskellActivity.hsc
+++ b/src/Android/HaskellActivity.hsc
@@ -93,7 +93,6 @@ data ActivityCallbacks = ActivityCallbacks
   , _activityCallbacks_onRestart :: IO ()
   , _activityCallbacks_onBackPressed :: IO ()
   , _activityCallbacks_onNewIntent :: String -> String -> IO ()
-  , _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer :: String -> IO ()
   }
 
 instance Default ActivityCallbacks where
@@ -107,7 +106,6 @@ instance Default ActivityCallbacks where
     , _activityCallbacks_onRestart = return ()
     , _activityCallbacks_onBackPressed = return ()
     , _activityCallbacks_onNewIntent = \_ _ -> return ()
-    , _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer = \_ -> return ()
     }
 
 traceBracket :: String -> IO a -> IO a
@@ -124,12 +122,9 @@ traceActivityCallbacks ac = ActivityCallbacks
   , _activityCallbacks_onRestart = traceBracket "onRestart" $ _activityCallbacks_onRestart ac
   , _activityCallbacks_onNewIntent = \x y -> traceBracket "onNewIntent" $ _activityCallbacks_onNewIntent ac x y
   , _activityCallbacks_onBackPressed = traceBracket "onBackPressed" $ _activityCallbacks_onBackPressed ac
-  , _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer = \x ->
-      traceBracket "firebaseInstanceIdServiceSendRegistrationToServer" $ _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer ac x
   }
 
 foreign import ccall "wrapper" wrapIO :: IO () -> IO (FunPtr (IO ()))
-foreign import ccall "wrapper" wrapCStringIO :: (CString -> IO ()) -> IO (FunPtr (CString -> IO ()))
 foreign import ccall "wrapper" wrapCStringCStringIO :: (CString -> CString -> IO ()) -> IO (FunPtr (CString -> CString -> IO ()))
 
 activityCallbacksToPtrs :: ActivityCallbacks -> IO ActivityCallbacksPtrs
@@ -147,10 +142,6 @@ activityCallbacksToPtrs ac = ActivityCallbacksPtrs
         b' <- peekCString b
         _activityCallbacks_onNewIntent ac a' b'
       )
-  <*> wrapCStringIO (\token -> do
-        token' <- peekCString token
-        _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer ac token'
-      )
 
 data ActivityCallbacksPtrs = ActivityCallbacksPtrs
   { _activityCallbacksPtrs_onCreate :: FunPtr (IO ())
@@ -162,7 +153,6 @@ data ActivityCallbacksPtrs = ActivityCallbacksPtrs
   , _activityCallbacksPtrs_onRestart :: FunPtr (IO ())
   , _activityCallbacksPtrs_onBackPressed :: FunPtr (IO ())
   , _activityCallbacksPtrs_onNewIntent :: FunPtr (CString -> CString -> IO ())
-  , _activityCallbacksPtrs_firebaseInstanceIdService_sendRegistrationToServer :: FunPtr (CString -> IO ())
   }
 
 instance Storable ActivityCallbacksPtrs where
@@ -178,7 +168,6 @@ instance Storable ActivityCallbacksPtrs where
     #{poke ActivityCallbacks, onRestart} p $ _activityCallbacksPtrs_onRestart ac
     #{poke ActivityCallbacks, onBackPressed} p $ _activityCallbacksPtrs_onBackPressed ac
     #{poke ActivityCallbacks, onNewIntent} p $ _activityCallbacksPtrs_onNewIntent ac
-    #{poke ActivityCallbacks, firebaseInstanceIdService_sendRegistrationToServer} p $ _activityCallbacksPtrs_firebaseInstanceIdService_sendRegistrationToServer ac
   peek p = ActivityCallbacksPtrs
     <$> #{peek ActivityCallbacks, onCreate} p
     <*> #{peek ActivityCallbacks, onStart} p
@@ -189,4 +178,3 @@ instance Storable ActivityCallbacksPtrs where
     <*> #{peek ActivityCallbacks, onRestart} p
     <*> #{peek ActivityCallbacks, onBackPressed} p
     <*> #{peek ActivityCallbacks, onNewIntent} p
-    <*> #{peek ActivityCallbacks, firebaseInstanceIdService_sendRegistrationToServer} p