More cleanup to JSON.