modified S2SClientSender to match ClientDeleter better