Remove silly workaround

Seems this iterator bug has since been fixed
Update for latest Uuid package