remove redundant code
Add KillClient test