More json cleanup.