Update root_chooser6.c

More cleanup