removed few legacy calls (nw)
Followup on Alex fix. Thanks a lot, Alex.