cleanups; removed unneeded #undef's