clean up/tournament model change