Quick clean up of UserService