more to_json cleanup