Get rid of remaining s/users/user