All todo's and println in client removed