add team match candidates, drop unneeded helper file