remove some unnecessary scoping