Removed external dependancies (json.net)