[z2134] Remove some not required things

(based on commit [12204] - 96e7635)

(based on commit [s1760] - 6059f2d)