removed relevantComps and friends