Feature #2027: Clean debug messages