Ensure clients are removed from the list before removing them