Removed unnecessary JSON support