More extraData erradication