Untested removal of GSon