cleanup to add user list.