Finished moving entities to json from xml. Removed xml entities