Get rid of json parsing for now