removal of unused code (nw)