Replace Handmade yojson tools by Yojson.Util + Using Yojson.Basic.json instead of Yojson.Safe.json