Remove remaining references to h-kill. From #220