Remove old tarif form affinitic refs #5838