removes uuid functions as they were copied and pasted and I couldn't find where I found them.
Merge branch 'refs/heads/0.2.1-dev'