Clean up client a bit.