Removed unecessary UUID code