Remove client manager
Add client manager