some more legacy stuff removed (nw)