Client code clean up.