more json-p cleanup