Improve javadoc.
Clear current client service name where appropriate.