Revert "added a helper method addSpeciesClause and applied in both species"

This reverts commit cb872cb2a51ef9c11faa30798a64791493c756c2.
Revert "Revert "added a helper method addSpeciesClause and applied in both species""

This reverts commit 46edd397cb628be1af870c5a19d46251a8ed541d.