Removed unneded #undef's