Cleanup

Some UUID cleanup