Remove dependency on user name.