Added Graceful Removal of Agents