Clean up all JSON code
Update CHANGELOG