Remove debug outut + add new functionality to client driver