Updated for feedback

Core/Notification/Extensions/Push.php

@@ -106,6 +106,9 @@ class Push implements Interfaces\NotificationExtensionInterface
         $push['big_picture'] = static::getNotificationBigPicture($notification, $from_user, $entity);
         $push['group'] = static::getNotificaitonGroup($notification, $from_user, $entity);
 
+        // temporary logging
+        error_log(var_export($push, true));
+
         return QueueClient::build()
             ->setExchange($notification['exchange'])
             ->setQueue($notification['queue'])

Core/Sessions/Manager.php

@@ -249,7 +249,7 @@ class Manager
         if ($this->session) {
             if (!$this->user) {
                 // If no user set grab from session.
-                $this->user = new User($this->session->getLoggedInUser());
+                $this->user = new User($this->session->getLoggedInUser(), false);
             }
 
             $this->user->setSurgeToken('') // Delete push notification token.

Entities/User.php

@@ -1228,7 +1228,6 @@ class User extends \ElggUser
             'toaster_notifications',
             'mode',
             'btc_address',
-            'surge_token',
         ]);
     }