Another cleanup of GCS.

more broken window fixing. PS we need to be more consistent with GCS vs GoogleCloudStorage!