Update zombie check + clean old code