Clean-up and enhanncements to ClientContext implementation