++ Removing external user id ugliness