Remove bits of unused code
Don't shadow uuid import