Client tidy up