Clean up uuid stuff