Experimental cleanup of team counting