Remove more _json references