Removed zz_killid references