Another cleanup of GCS.