json.h edits
json-forwards.h deleted