A bit of cleanup in Client