Cleanup in json converter