Removed IFavorableTraitCostCalculator from hierarchy