[z1882] Remove one obsolete variable and fix a comment

Also backport the rest of c3abb55 which was partly backported in d47a39b

(based on commit [s1453] - a3e8279)