Remove deprecated UUID
Minor cleanup
Merge pull request #352 from eile/master

Fixes