More client cleanup

Some more cleanup as I look into the code...