Remove call to remove_npc() from npc::die().
It should only be called from cleanup_dead().
npc::die() merely marks the NPC as dead.