Remove reference to JSONObject outside of JSON specific classes