clean up uuid handling...