[REF] Get rid of UH Build/Derive functions