Cleanup client.init

Cleaning unused variables.