Move remove users out of for loop