[REF] Use endpoints for most UHs
[REF] UH whitespace cleanup