added removal of duplicate users