Removed some unused macros (nw)