SI-7566 Remove items deprecated for 2.12