removed some leftovers (nw)