remove some more uid usages