Get rid of special case for species