Removing json/xml stuff (to another branch)