Remove more JObject dependancies