clean up and use new tournament interface for the multi stage unification effort