Replace the recursive clear_nodes method by a do while loop (#2143)

Replace the recursive clear_nodes method by a do while loop (#2143) #2384