Remove conversion to json until final response