REMOVED EVIL #DEFINE AND #UNDEF