Merge "Remove JSON-specific code from client settings"