         return callback err  if err
 
         customCredentials = @getAt('credentials.custom') ? []
-        { context: { group }, connection: { delegate: account } } = client
-
-        notifyOptions =
-          account: account
-          group: group
-          target: if @getAt('accessLevel') is 'group' then 'group' else 'account'
-
-        @removeAndNotify notifyOptions, (err) ->
+
+        @removeAndNotify (@getNotifyOptions client), (err) ->
           return callback err  if err
 
           # delete custom credentials if exists ~ GG

      originId     = delegate.getId()
      options      = { originId, group }

      notifyOptions =
        account : delegate
        group   : group.slug
        target  : if @accessLevel is 'group' then 'group' else 'account'

      updateAndNotify = (query) =>
        @updateAndNotify notifyOptions, query, (err, results) =>
          callback err, this

      # Create a clone of provided data to work on it around


    success: revive

      shouldReviveClient    : yes
      shouldReviveProvider  : no
      shouldFetchGroupLimit : yes

    , (client, data, callback) ->
