Removed some unused defines (nw)