Update client for new JSON spec.
Cleanup.