Revert "Added a client manager"

This reverts commit 888d47f91fc1d2ccbded392c8da46b3373ce8ef0.
Revert "Revert "Added a client manager""

This reverts commit f90511ca78920ee9d4e40981ebd0bc810efb6f3b.