Remove do-while loops