Clean up the Google client code