Remove unncessary scopes after confering with GCP folks