Remove componentusage from common and replace it in the species types block with new code