Cleanup gson and move to 2.2.4