Cleaning up GSON dependencies