Revert "Added UID"

This reverts commit b506465ba618db864fb0fe667b2e3a3bf9e15c68.