Remove remnants of user ID handling. Replace it with username.
Remove a couple of obsolete TODOs.