Make updateUser check token and clean up some noise.