Clean up before ripping apart Client internals