Cleanup of Z display from lcd_z_reformat branch