Cleaning out nw cruft