[fix] Resolved client generation.
[fix] Resolved incorrect removal of clients.