Remove more macros to ease debugging