UUID support

And removed unused classes