SwarmClient remove/add callback fix