Removes now-redundant UID column from Users.
Adds/Updates annotations.