Revert "Added UID"

This reverts commit 34e2f23d4fbb3010e42db9b308f2bd7deb484e28.