got rid of all that uuid nonsense