Remove usage of old (s)digitizers (Laurent, Ivana)