Additional JSON Cleanup