Merge "Removed useless "while" loop"