Remove uuid
Merge branch 'remove_uuid'
Version bump