Added functionality to remove PAN or Track2Data depending on IndustryType