Change to use single Tier and remove redundant Tier field from TechnologyChoice