gson cleanup work