removed legacy not used code (nw)