[z2251] Some code cleanup

(based on commit [12355] - a5ecaff)

(based on commit [s1888] - fe71b34)