removing some unused legacy things (nw)