Simplify my last commit on debug mode