Cleanup of root
gen_pairs updated