Removed a while loop