More cleanup on debug