Cleanup
Brought in old taxon handling test
More clean up of error code