Remove some done TODOs.
Can search for more than one user now and doesn't have to be exactly the username.