clean up org.json usage