Fix team removal