Remove stray if statement
Remove old comments
Add team membership to competition calculator