Starting to remove simplejson dependencies