more json cleanup