CLOUD-217 remove global scope