removed some scopes