[client-removal] ensure clients are removed from the list
Merge pull request #632 from portertech/client-removal

Ensure clients are removed from the list before removing them