Clean up client.init

Typical cleanup of client.init file.