Removed old UUID code.
Clean up warnings and some deprecations.
Removed broken file.
Replaced borked file