Remove a couple of unnecessary scopes