some more cleanup (nw)