Clean up some UUID variables