First step in cleaning up dependency on UUIDTools