Cleanup post JSON harness merge