latch8 cleanup (nw)