More z_norm removal