Removed leftover code (nw)