Cleanup of json