Clean up some named scopes