Remove left-over and unused debug message macros