update for new json format
cleanup