some cleanup (nw)