remove unused options, added match links to team pages