Remove more obsolote macros, make DEBUG_MACRO always on.