Removed some of the json stuff, not all of it.