more genericization
removed deprecated simplejson
More 1.6-ification