Remove some junk by using Gson instead