Remove some JObject dependancies