Added ClientBuilder class
Removed debugging code