More cleanup of old json.